[gtk+] Adwaita: fix scale with marks size

[Lapo Calamandrei <lapo src gnome org>]

commit 597151c736b7c0979be48d7aef2c3bfab4998bb9
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Mar 2 21:47:24 2016 +0100

    Adwaita: fix scale with marks size

 gtk/theme/Adwaita/_common.scss           |   13 +++++++++----
 gtk/theme/Adwaita/gtk-contained-dark.css |   27 ++++++++++++++++++++++-----
 gtk/theme/Adwaita/gtk-contained.css      |   27 ++++++++++++++++++++++-----
 3 files changed, 53 insertions(+), 14 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f1437b6..501412d 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2589,10 +2589,15 @@ scale {
   marks {
     color: gtkalpha(currentColor, 0.4);
 
-    &.top { margin-bottom: $_marks_distance; }
-    &.bottom { margin-top: $_marks_distance; }
-    &.left { margin-right: $_marks_distance; }
-    &.right { margin-left: $_marks_distance; }
+    @each $marks_pos, $marks_margin in (top, bottom),
+                                       (bottom, top),
+                                       (left, right),
+                                       (right, left) {
+      &.#{$marks_pos} {
+        margin-#{$marks_margin}: $_marks_distance;
+        margin-#{$marks_pos}: -($_marks_distance+$_marks_lenght);
+      }
+    }
   }
 
   &.horizontal  indicator {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3d61a26..05ff39c 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2648,7 +2648,20 @@ scale highlight, progressbar progress {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 12px; }
+  padding: 12px;
+  /*
+      &.top {
+        margin-bottom: $_marks_distance;
+        margin-top: -($_marks_distance+$_marks_lenght);
+      }
+  
+      &.bottom {
+        margin-top: $_marks_distance;
+      }
+      &.left { margin-right: $_marks_distance; }
+      &.right { margin-left: $_marks_distance; }
+    }
+  */ }
   scale fill,
   scale highlight {
     margin: -1px; }
@@ -2761,13 +2774,17 @@ scale {
   scale marks {
     color: alpha(currentColor,0.4); }
     scale marks.top {
-      margin-bottom: 6px; }
+      margin-bottom: 6px;
+      margin-top: -12px; }
     scale marks.bottom {
-      margin-top: 6px; }
+      margin-top: 6px;
+      margin-bottom: -12px; }
     scale marks.left {
-      margin-right: 6px; }
+      margin-right: 6px;
+      margin-left: -12px; }
     scale marks.right {
-      margin-left: 6px; }
+      margin-left: 6px;
+      margin-right: -12px; }
   scale.horizontal indicator {
     min-height: 6px;
     min-width: 1px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 90259c3..d4a1106 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2679,7 +2679,20 @@ scale highlight, progressbar progress {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 12px; }
+  padding: 12px;
+  /*
+      &.top {
+        margin-bottom: $_marks_distance;
+        margin-top: -($_marks_distance+$_marks_lenght);
+      }
+  
+      &.bottom {
+        margin-top: $_marks_distance;
+      }
+      &.left { margin-right: $_marks_distance; }
+      &.right { margin-left: $_marks_distance; }
+    }
+  */ }
   scale fill,
   scale highlight {
     margin: -1px; }
@@ -2792,13 +2805,17 @@ scale {
   scale marks {
     color: alpha(currentColor,0.4); }
     scale marks.top {
-      margin-bottom: 6px; }
+      margin-bottom: 6px;
+      margin-top: -12px; }
     scale marks.bottom {
-      margin-top: 6px; }
+      margin-top: 6px;
+      margin-bottom: -12px; }
     scale marks.left {
-      margin-right: 6px; }
+      margin-right: 6px;
+      margin-left: -12px; }
     scale marks.right {
-      margin-left: 6px; }
+      margin-left: 6px;
+      margin-right: -12px; }
   scale.horizontal indicator {
     min-height: 6px;
     min-width: 1px; }