Adwaita: scale slider assets refresh

...and update the theme accordingly.

gtk/theme/Adwaita/_common.scss

@@ -2476,28 +2476,33 @@ treeview.view radio {
 }
 
 scale {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 26;
+  -GtkScale-slider-length: 22;
+  -GtkRange-slider-width: 30;
   -GtkRange-trough-border: 2;
 
   outline-offset: -10px;
-  -gtk-outline-radius: 6px;
+  -gtk-outline-radius: 7px;
+
+  &.horizontal {
+    trough { margin: 15px 12px; }
+    slider { margin: 5px 1px; }
+  }
+
+  &.vertical {
+    trough { margin: 12px 15px; }
+    slider { margin: 1px 5px; }
+  }
 
   &.fine-tune {
     outline-offset: -8px;
-    -gtk-outline-radius: 8px;
+    -gtk-outline-radius: 10px;
 
     trough {
-      margin: 11px;
-      &, fill, highlight { border-radius: 4px; }
+      margin: 12px;
+      &, fill, highlight { border-radius: 5px; }
     }
   }
 
-  trough { margin: 13px; }
-
-  &.horizontal slider { margin: 3px 0; }
-  &.vertical slider { margin: 0 3px; }
-
   // the backing bit
   trough { @extend %scale_trough; }
 
@@ -2596,7 +2601,7 @@ scale {
 
           trough#{$nth_child} {
             slider {
-              margin: 0;
+              margin: 0 1px;
               &#{$state} {
                 $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}';
                 // @warn $_file_name; // uncomment for debuggin purpose...
@@ -2606,10 +2611,15 @@ scale {
                 background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png'));
 
                 $_scale_slider_bg_pos: bottom;
-                @if $dir_infix == 'horz' { @if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: top; }}
+                @if $dir_infix == 'horz' {
+                  @if $marks_infix == 'scale-has-marks-above' {
+                    $_scale_slider_bg_pos: top;
+                    margin-top: 1px;
+                  }
+                }
                 @else {
-                  @if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: left; }
-                  @else { $_scale_slider_bg_pos: right; }
+                  @if $marks_infix == 'scale-has-marks-above' { $_scale_slider_bg_pos: left bottom; }
+                  @else { $_scale_slider_bg_pos: right bottom; }
                 }
 
                 background-position: $_scale_slider_bg_pos;

gtk/theme/Adwaita/assets.txt

@@ -1,75 +1,3 @@
-checkbox-checked
-checkbox-checked-hover
-checkbox-checked-active
-checkbox-checked-insensitive
-checkbox-checked-backdrop
-checkbox-checked-backdrop-insensitive
-checkbox-unchecked
-checkbox-unchecked-hover
-checkbox-unchecked-active
-checkbox-unchecked-insensitive
-checkbox-unchecked-backdrop
-checkbox-unchecked-backdrop-insensitive
-checkbox-mixed
-checkbox-mixed-hover
-checkbox-mixed-active
-checkbox-mixed-insensitive
-checkbox-mixed-backdrop
-checkbox-mixed-backdrop-insensitive
-radio-checked
-radio-checked-hover
-radio-checked-active
-radio-checked-insensitive
-radio-checked-backdrop
-radio-checked-backdrop-insensitive
-radio-unchecked
-radio-unchecked-hover
-radio-unchecked-active
-radio-unchecked-insensitive
-radio-unchecked-backdrop
-radio-unchecked-backdrop-insensitive
-radio-mixed
-radio-mixed-hover
-radio-mixed-active
-radio-mixed-insensitive
-radio-mixed-backdrop
-radio-mixed-backdrop-insensitive
-selected-checkbox-checked
-selected-checkbox-checked-hover
-selected-checkbox-checked-active
-selected-checkbox-checked-insensitive
-selected-checkbox-checked-backdrop
-selected-checkbox-checked-backdrop-insensitive
-selected-checkbox-unchecked
-selected-checkbox-unchecked-hover
-selected-checkbox-unchecked-active
-selected-checkbox-unchecked-insensitive
-selected-checkbox-unchecked-backdrop
-selected-checkbox-unchecked-backdrop-insensitive
-selected-checkbox-mixed
-selected-checkbox-mixed-hover
-selected-checkbox-mixed-active
-selected-checkbox-mixed-insensitive
-selected-checkbox-mixed-backdrop
-selected-checkbox-mixed-backdrop-insensitive
-selected-radio-checked
-selected-radio-checked-hover
-selected-radio-checked-active
-selected-radio-checked-insensitive
-selected-radio-checked-backdrop
-selected-radio-checked-backdrop-insensitive
-selected-radio-unchecked
-selected-radio-unchecked-hover
-selected-radio-unchecked-active
-selected-radio-unchecked-insensitive
-selected-radio-unchecked-backdrop
-selected-radio-unchecked-backdrop-insensitive
-selected-radio-mixed
-selected-radio-mixed-hover
-selected-radio-mixed-active
-selected-radio-mixed-insensitive
-selected-radio-mixed-backdrop
-selected-radio-mixed-backdrop-insensitive
 text-select-end
 text-select-end-hover
 text-select-end-active
@@ -82,50 +10,6 @@ text-select-end-active-dark
 text-select-start-dark
 text-select-start-hover-dark
 text-select-start-active-dark
-checkbox-checked-dark
-checkbox-checked-hover-dark
-checkbox-checked-active-dark
-checkbox-checked-insensitive-dark
-checkbox-checked-backdrop-dark
-checkbox-checked-backdrop-insensitive-dark
-checkbox-unchecked-dark
-checkbox-unchecked-hover-dark
-checkbox-unchecked-active-dark
-checkbox-unchecked-insensitive-dark
-checkbox-unchecked-backdrop-dark
-checkbox-unchecked-backdrop-insensitive-dark
-checkbox-selectionmode
-checkbox-hover-selectionmode
-checkbox-active-selectionmode
-checkbox-backdrop-selectionmode
-checkbox-checked-selectionmode
-checkbox-checked-hover-selectionmode
-checkbox-checked-active-selectionmode
-checkbox-checked-backdrop-selectionmode
-checkbox-mixed-dark
-checkbox-mixed-hover-dark
-checkbox-mixed-active-dark
-checkbox-mixed-insensitive-dark
-checkbox-mixed-backdrop-dark
-checkbox-mixed-backdrop-insensitive-dark
-radio-checked-dark
-radio-checked-hover-dark
-radio-checked-active-dark
-radio-checked-insensitive-dark
-radio-checked-backdrop-dark
-radio-checked-backdrop-insensitive-dark
-radio-unchecked-dark
-radio-unchecked-hover-dark
-radio-unchecked-active-dark
-radio-unchecked-insensitive-dark
-radio-unchecked-backdrop-dark
-radio-unchecked-backdrop-insensitive-dark
-radio-mixed-dark
-radio-mixed-hover-dark
-radio-mixed-active-dark
-radio-mixed-insensitive-dark
-radio-mixed-backdrop-dark
-radio-mixed-backdrop-insensitive-dark
 slider-horz-scale-has-marks-below
 slider-horz-scale-has-marks-below-hover
 slider-horz-scale-has-marks-below-active

gtk/theme/Adwaita/gtk-contained-dark.css

@@ -2646,24 +2646,26 @@ scale highlight, progressbar progress {
       border-color: transparent; }
 
 scale {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 26;
+  -GtkScale-slider-length: 22;
+  -GtkRange-slider-width: 30;
   -GtkRange-trough-border: 2;
   outline-offset: -10px;
-  -gtk-outline-radius: 6px; }
+  -gtk-outline-radius: 7px; }
+  scale.horizontal trough {
+    margin: 15px 12px; }
+  scale.horizontal slider {
+    margin: 5px 1px; }
+  scale.vertical trough {
+    margin: 12px 15px; }
+  scale.vertical slider {
+    margin: 1px 5px; }
   scale.fine-tune {
     outline-offset: -8px;
-    -gtk-outline-radius: 8px; }
+    -gtk-outline-radius: 10px; }
     scale.fine-tune trough {
-      margin: 11px; }
+      margin: 12px; }
       scale.fine-tune trough, scale.fine-tune trough fill, scale.fine-tune trough highlight {
-        border-radius: 4px; }
-  scale trough {
-    margin: 13px; }
-  scale.horizontal slider {
-    margin: 3px 0; }
-  scale.vertical slider {
-    margin: 0 3px; }
+        border-radius: 5px; }
   scale fill, scale fill:backdrop {
     background-color: #1c1f1f;
     box-shadow: none; }
@@ -2764,61 +2766,67 @@ scale {
   scale marks {
     color: alpha(currentColor,0.4); }
   scale trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
+      margin-top: 1px;
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
+      margin-top: 1px;
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
+      margin-top: 1px;
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
+      margin-top: 1px;
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
+      margin-top: 1px;
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
+      margin-top: 1px;
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2827,7 +2835,7 @@ scale {
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2836,7 +2844,7 @@ scale {
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2845,7 +2853,7 @@ scale {
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2854,7 +2862,7 @@ scale {
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2863,7 +2871,7 @@ scale {
       background-repeat: no-repeat;
       box-shadow: none; }
   scale trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2872,111 +2880,111 @@ scale {
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
-      background-position: left;
+      background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
-      background-position: left;
+      background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
-      background-position: left;
+      background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
-      background-position: left;
+      background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
-      background-position: left;
+      background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:last-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
-      background-position: left;
+      background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
-      background-position: right;
+      background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
-      background-position: right;
+      background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
-      background-position: right;
+      background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
-      background-position: right;
+      background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
-      background-position: right;
+      background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
   scale.vertical trough:first-child:not(:only-child) slider {
-    margin: 0; }
+    margin: 0 1px; }
     scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
-      background-position: right;
+      background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }