From bac7408be4f5479c3e6d67cc1d7b75f8a9a12328 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Wed, 12 Nov 2014 17:30:59 +0100
Subject: [PATCH] Adwaita: set scale trough margins where they belong.

---
 gtk/resources/theme/Adwaita/_common.scss           | 11 ++++++++---
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |  6 +++---
 gtk/resources/theme/Adwaita/gtk-contained.css      |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 0da6d22a5f..fe89e060b2 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2235,18 +2235,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 .scale,
 .scale.scale-has-marks-above.scale-has-marks-below,
 .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+  // FIXME: rationalize
   -GtkScale-slider-length: 20;
   -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; }
+    &.trough {
+      margin: 8px;
+      border-radius: 4px;
+    }
   }
+
   &.slider {
     //FIXME: better gradient on the slider and hover state
     @include button(normal);
@@ -2297,6 +2301,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     }
   }
   &.trough {
+    margin: 10px;
     border: 1px solid $borders_color;
     border-radius: 3px;
     background-color: mix($bg_color,$borders_color,60%);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 7264dea8ac..116e26b0cb 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -2930,17 +2930,16 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 20;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
-  outline-radius: 4px;
-  margin: 10px; }
+  outline-radius: 4px; }
   .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;
     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 {
+      margin: 8px;
       border-radius: 4px; }
   .scale.slider,
   .scale.scale-has-marks-above.scale-has-marks-below.slider,
@@ -3048,6 +3047,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   .scale.trough,
   .scale.scale-has-marks-above.scale-has-marks-below.trough,
   .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+    margin: 10px;
     border: 1px solid #1c1f1f;
     border-radius: 3px;
     background-color: #2d3232;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index b448aab9aa..e2ee8f1294 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -3083,17 +3083,16 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkRange-slider-width: 20;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
-  outline-radius: 4px;
-  margin: 10px; }
+  outline-radius: 4px; }
   .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;
     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 {
+      margin: 8px;
       border-radius: 4px; }
   .scale.slider,
   .scale.scale-has-marks-above.scale-has-marks-below.slider,
@@ -3201,6 +3200,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   .scale.trough,
   .scale.scale-has-marks-above.scale-has-marks-below.trough,
   .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+    margin: 10px;
     border: 1px solid #a1a1a1;
     border-radius: 3px;
     background-color: #cecece;