From 40775415cc93a6abf25ce6281bfbc5125cde2e22 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 14 Jun 2014 15:31:05 +0200 Subject: [PATCH] Adwaita: fix GtkScale outline offset and radius --- gtk/resources/theme/Adwaita/_common.scss | 3 +++ gtk/resources/theme/Adwaita/gtk-contained-dark.css | 5 ++++- gtk/resources/theme/Adwaita/gtk-contained.css | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 80820b11b9..a972bbc2b4 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1218,9 +1218,12 @@ GtkCheckButton.text-button:selected { background-color: transparent; } -GtkRange-slider-width: 20; -GtkRange-trough-border: 2; outline-offset: -9px; + outline-radius: 4px; margin: 10px; &.fine-tune { margin: 8px; + outline-offset: -7px; + outline-radius: 6px; &.trough { border-radius: 4px; } } &.slider { diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 9f80950714..9868b8734f 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1546,11 +1546,14 @@ GtkCheckButton.text-button:selected { -GtkRange-slider-width: 20; -GtkRange-trough-border: 2; outline-offset: -9px; + outline-radius: 4px; margin: 10px; } .scale.fine-tune, .scale.scale-has-marks-above.scale-has-marks-below.fine-tune, .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune { - margin: 8px; } + margin: 8px; + outline-offset: -7px; + outline-radius: 6px; } .scale.fine-tune.trough, .scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough, .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough { diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 4c49b0fa8e..28dbaa1499 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1545,11 +1545,14 @@ GtkCheckButton.text-button:selected { -GtkRange-slider-width: 20; -GtkRange-trough-border: 2; outline-offset: -9px; + outline-radius: 4px; margin: 10px; } .scale.fine-tune, .scale.scale-has-marks-above.scale-has-marks-below.fine-tune, .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune { - margin: 8px; } + margin: 8px; + outline-offset: -7px; + outline-radius: 6px; } .scale.fine-tune.trough, .scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough, .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough {