simplify scale style

7 files changed, 74 insertions, 154 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index d440046..af922a3 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2046,32 +2046,21 @@ radio {
     margin: 0; }
 
 scale {
-  min-height: 10px;
-  min-width: 10px; }
-  scale.horizontal {
-    padding: 6px 0; }
-    scale.horizontal trough {
-      padding: 0 7px; }
-    scale.horizontal highlight, scale.horizontal fill {
-      margin: 0 -7px; }
-  scale.vertical {
-    padding: 0 6px; }
-    scale.vertical trough {
-      padding: 7px 0; }
-    scale.vertical highlight, scale.vertical fill {
-      margin: -7px 0; }
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px; }
+  scale.horizontal trough {
+    padding: 0 4px; }
+  scale.horizontal highlight, scale.horizontal fill {
+    margin: 0 -4px; }
+  scale.vertical trough {
+    padding: 4px 0; }
+  scale.vertical highlight, scale.vertical fill {
+    margin: -4px 0; }
   scale slider {
     min-height: 15px;
     min-width: 15px;
     margin: -6px; }
-  scale.fine-tune.horizontal {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    min-height: 15px; }
-  scale.fine-tune.vertical {
-    padding-left: 4px;
-    padding-right: 4px;
-    min-width: 15px; }
   scale.fine-tune slider {
     margin: -4px; }
   scale.fine-tune fill,
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index b299672..614736f 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2045,32 +2045,21 @@ radio {
     margin: 0; }
 
 scale {
-  min-height: 10px;
-  min-width: 10px; }
-  scale.horizontal {
-    padding: 6px 0; }
-    scale.horizontal trough {
-      padding: 0 7px; }
-    scale.horizontal highlight, scale.horizontal fill {
-      margin: 0 -7px; }
-  scale.vertical {
-    padding: 0 6px; }
-    scale.vertical trough {
-      padding: 7px 0; }
-    scale.vertical highlight, scale.vertical fill {
-      margin: -7px 0; }
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px; }
+  scale.horizontal trough {
+    padding: 0 4px; }
+  scale.horizontal highlight, scale.horizontal fill {
+    margin: 0 -4px; }
+  scale.vertical trough {
+    padding: 4px 0; }
+  scale.vertical highlight, scale.vertical fill {
+    margin: -4px 0; }
   scale slider {
     min-height: 15px;
     min-width: 15px;
     margin: -6px; }
-  scale.fine-tune.horizontal {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    min-height: 15px; }
-  scale.fine-tune.vertical {
-    padding-left: 4px;
-    padding-right: 4px;
-    min-width: 15px; }
   scale.fine-tune slider {
     margin: -4px; }
   scale.fine-tune fill,
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index d7caa74..35c5867 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2046,32 +2046,21 @@ radio {
     margin: 0; }
 
 scale {
-  min-height: 10px;
-  min-width: 10px; }
-  scale.horizontal {
-    padding: 6px 0; }
-    scale.horizontal trough {
-      padding: 0 7px; }
-    scale.horizontal highlight, scale.horizontal fill {
-      margin: 0 -7px; }
-  scale.vertical {
-    padding: 0 6px; }
-    scale.vertical trough {
-      padding: 7px 0; }
-    scale.vertical highlight, scale.vertical fill {
-      margin: -7px 0; }
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px; }
+  scale.horizontal trough {
+    padding: 0 4px; }
+  scale.horizontal highlight, scale.horizontal fill {
+    margin: 0 -4px; }
+  scale.vertical trough {
+    padding: 4px 0; }
+  scale.vertical highlight, scale.vertical fill {
+    margin: -4px 0; }
   scale slider {
     min-height: 15px;
     min-width: 15px;
     margin: -6px; }
-  scale.fine-tune.horizontal {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    min-height: 15px; }
-  scale.fine-tune.vertical {
-    padding-left: 4px;
-    padding-right: 4px;
-    min-width: 15px; }
   scale.fine-tune slider {
     margin: -4px; }
   scale.fine-tune fill,
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 80c9c64..e7e0bf7 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2045,32 +2045,21 @@ radio {
     margin: 0; }
 
 scale {
-  min-height: 10px;
-  min-width: 10px; }
-  scale.horizontal {
-    padding: 6px 0; }
-    scale.horizontal trough {
-      padding: 0 7px; }
-    scale.horizontal highlight, scale.horizontal fill {
-      margin: 0 -7px; }
-  scale.vertical {
-    padding: 0 6px; }
-    scale.vertical trough {
-      padding: 7px 0; }
-    scale.vertical highlight, scale.vertical fill {
-      margin: -7px 0; }
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px; }
+  scale.horizontal trough {
+    padding: 0 4px; }
+  scale.horizontal highlight, scale.horizontal fill {
+    margin: 0 -4px; }
+  scale.vertical trough {
+    padding: 4px 0; }
+  scale.vertical highlight, scale.vertical fill {
+    margin: -4px 0; }
   scale slider {
     min-height: 15px;
     min-width: 15px;
     margin: -6px; }
-  scale.fine-tune.horizontal {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    min-height: 15px; }
-  scale.fine-tune.vertical {
-    padding-left: 4px;
-    padding-right: 4px;
-    min-width: 15px; }
   scale.fine-tune slider {
     margin: -4px; }
   scale.fine-tune fill,
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 9602e3c..2058160 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2049,32 +2049,21 @@ radio {
     margin: 0; }
 
 scale {
-  min-height: 10px;
-  min-width: 10px; }
-  scale.horizontal {
-    padding: 6px 0; }
-    scale.horizontal trough {
-      padding: 0 7px; }
-    scale.horizontal highlight, scale.horizontal fill {
-      margin: 0 -7px; }
-  scale.vertical {
-    padding: 0 6px; }
-    scale.vertical trough {
-      padding: 7px 0; }
-    scale.vertical highlight, scale.vertical fill {
-      margin: -7px 0; }
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px; }
+  scale.horizontal trough {
+    padding: 0 4px; }
+  scale.horizontal highlight, scale.horizontal fill {
+    margin: 0 -4px; }
+  scale.vertical trough {
+    padding: 4px 0; }
+  scale.vertical highlight, scale.vertical fill {
+    margin: -4px 0; }
   scale slider {
     min-height: 15px;
     min-width: 15px;
     margin: -6px; }
-  scale.fine-tune.horizontal {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    min-height: 15px; }
-  scale.fine-tune.vertical {
-    padding-left: 4px;
-    padding-right: 4px;
-    min-width: 15px; }
   scale.fine-tune slider {
     margin: -4px; }
   scale.fine-tune fill,
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 127966a..e1b7872 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2049,32 +2049,21 @@ radio {
     margin: 0; }
 
 scale {
-  min-height: 10px;
-  min-width: 10px; }
-  scale.horizontal {
-    padding: 6px 0; }
-    scale.horizontal trough {
-      padding: 0 7px; }
-    scale.horizontal highlight, scale.horizontal fill {
-      margin: 0 -7px; }
-  scale.vertical {
-    padding: 0 6px; }
-    scale.vertical trough {
-      padding: 7px 0; }
-    scale.vertical highlight, scale.vertical fill {
-      margin: -7px 0; }
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px; }
+  scale.horizontal trough {
+    padding: 0 4px; }
+  scale.horizontal highlight, scale.horizontal fill {
+    margin: 0 -4px; }
+  scale.vertical trough {
+    padding: 4px 0; }
+  scale.vertical highlight, scale.vertical fill {
+    margin: -4px 0; }
   scale slider {
     min-height: 15px;
     min-width: 15px;
     margin: -6px; }
-  scale.fine-tune.horizontal {
-    padding-top: 4px;
-    padding-bottom: 4px;
-    min-height: 15px; }
-  scale.fine-tune.vertical {
-    padding-left: 4px;
-    padding-right: 4px;
-    min-width: 15px; }
   scale.fine-tune slider {
     margin: -4px; }
   scale.fine-tune fill,
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index b045b74..e57988c 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -2053,20 +2053,18 @@ scale {
   $_marks_length: 3px;
   $_marks_distance: 1px;
 
-  min-height: 10px;
-  min-width: 10px;
+  min-height: 15px;
+  min-width: 15px;
+  padding: 3px;
 
   &.horizontal {
-    padding: 6px 0;
-
-    trough { padding: 0 7px; }
-    highlight, fill { margin: 0 -7px; }
+    trough { padding: 0 4px; }
+    highlight, fill { margin: 0 -4px; }
   }
-  &.vertical {
-    padding: 0 6px;
 
-    trough { padding: 7px 0; }
-    highlight, fill { margin: -7px 0; }
+  &.vertical {
+    trough { padding: 4px 0; }
+    highlight, fill { margin: -4px 0; }
   }
 
   // The slider is inside the trough, negative margin to make it bigger
@@ -2078,18 +2076,6 @@ scale {
 
   // Click-and-hold the slider to activate
   &.fine-tune {
-    &.horizontal {
-      padding-top: 4px;
-      padding-bottom: 4px;
-      min-height: 15px;
-    }
-
-    &.vertical {
-      padding-left: 4px;
-      padding-right: 4px;
-      min-width: 15px;
-    }
-
     // Make the trough grow in fine-tune mode
     slider { margin: -4px; }