diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index bee9621344..2cd5891702 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/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;
diff --git a/gtk/theme/Adwaita/assets.svg b/gtk/theme/Adwaita/assets.svg
index 6bfabc7049..e8f119c14f 100644
--- a/gtk/theme/Adwaita/assets.svg
+++ b/gtk/theme/Adwaita/assets.svg
@@ -19,7 +19,52 @@
+ id="dark-normal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="dark-hover">
+ style="stop-color:#393f3f;stop-opacity:1" />
+ style="stop-color:#2f3434;stop-opacity:1" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -669,7 +331,7 @@
y2="404.45575" />
-
-
+
+
+
+
+
@@ -899,27 +591,32 @@
style="display:inline">
+
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -927,57 +624,67 @@
+
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4605);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6165);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -985,29 +692,34 @@
+
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4637);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -1015,28 +727,34 @@
+ inkscape:label="#g5543"
+ transform="matrix(1.0002802,0,0,1.0006911,-0.05474109,-0.13221695)">
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4838-7-9);fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1044,58 +762,69 @@
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5571);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ inkscape:label="#g5557"
+ transform="matrix(1.000141,0,0,1.0002924,-0.03393889,-0.06469591)">
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4838-7-9-0);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1103,58 +832,69 @@
+ inkscape:label="#g5564"
+ transform="matrix(1.0001409,0,0,1.0002922,-0.04219538,-0.06466128)">
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4838-7-9-8);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1164,164 +904,204 @@
id="slider-horz-scale-has-marks-above-hover"
transform="matrix(1,0,0,0.99944391,2.5596046e-6,9.991327)"
inkscape:label="#g5522-9">
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-5);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-3);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-2);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3);fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1330,98 +1110,113 @@
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-9);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-5);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-6);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1429,252 +1224,353 @@
inkscape:connector-curvature="0"
id="path3497-8-5-5-9-2-9-6"
d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -3.70999,9.74715932 0,13.4655793 L 195,10.862168 201.71751,4.1293766 c 3.70999,-3.71841698 3.70999,-9.7471583 0,-13.4655793 z"
- style="color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ d="m 218.28068,4.0858464 c 3.71097,3.72314 9.72765,3.7231365 13.43862,0 3.71098,-3.72313657 3.71098,-9.7595303 0,-13.4826702 l -6.71931,-6.7413352 -6.71931,6.7413352 c -3.71099,3.7231364 -3.71099,9.75953015 0,13.4826702 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00048888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
-
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.000278;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.000278;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-6);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1684,118 +1580,138 @@
id="slider-horz-scale-has-marks-above-active"
transform="matrix(1,0,0,0.99944391,2.4701977e-6,39.991327)"
inkscape:label="#g5522-9-5">
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-5-5);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-3-7);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-2-4);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -1804,91 +1720,106 @@
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-6);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-9);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-4);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
@@ -2200,17 +2131,17 @@
inkscape:connector-curvature="0"
id="path10579"
d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
- style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10615);fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4679);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient10619);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -2299,7 +2230,7 @@
transform="matrix(-1,0,0,-1,540.03033,178.72437)"
id="text-select-end-dark">
@@ -2317,12 +2248,12 @@
inkscape:connector-curvature="0"
id="path10692"
d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z"
- style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3e4444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2f3434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient11093);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -2362,7 +2293,7 @@
inkscape:connector-curvature="0"
id="path10694-2"
d="m 186.22101,-1.136263 c 0.113,2.14971 2.0766,6.58693 6.51409,7.54144 L 203.9723,9.776397 204,-2.417893 c -0.001,-0.0205 0.001,-0.042 0,-0.0625 -0.01,-0.15503 -0.0445,-0.3143 -0.0625,-0.46875 l -0.84911,11.66488 -10.17656,-2.95701 c -5.47891,-1.2801 -6.69085,-6.89499 -6.69085,-6.89499 z"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.05;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
sodipodi:nodetypes="ccccccccc" />
@@ -2420,7 +2351,7 @@
inkscape:connector-curvature="0"
id="path12834"
d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z"
- style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12904);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -2473,7 +2404,7 @@
transform="matrix(1,0,0,-1,122,8.7243652)"
id="text-select-start-hover">
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12908);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -2544,7 +2475,7 @@
transform="matrix(1,0,0,-1,122,238.72437)"
id="text-select-start-active-dark">
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323737;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -2580,7 +2511,7 @@
inkscape:connector-curvature="0"
id="path12892"
d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12912);fill-opacity:1;fill-rule:nonzero;stroke:#1c1f1f;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12912);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323737;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/gtk/theme/Adwaita/assets.txt b/gtk/theme/Adwaita/assets.txt
index fbff435095..4b27b15e1b 100644
--- a/gtk/theme/Adwaita/assets.txt
+++ b/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
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png
index e256bc595e..ab61547a88 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png
index 996e037763..0e0e10e076 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png
index fdec096630..ed98f11f87 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png
index cf4e74ee1f..dda5e2b6db 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
index 56e33e70d6..cffa66d81a 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
index bb36a343a4..cd4f68d88c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
index 56e33e70d6..a235d8367e 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
index bb36a343a4..c1d06fbbf7 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
index 6238b63312..c7b3008398 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
index e88ec989de..aff5729698 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop.png
index 4bbc54b8a0..63475e6044 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop@2.png
index fd5ddfdc08..a7cf7340d5 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-backdrop@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png
index 52b4663dec..8d792d3d92 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png
index ec41e16fff..9a66ec7e6c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png
index c687bf5b0f..1cf74e9f82 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
index 48bf9f6105..5eaf47d9f8 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png
index b53a8fef01..70fb94e0b7 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png
index 52b7b2904c..e0827dd18c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
index 56e33e70d6..a235d8367e 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
index bb36a343a4..c1d06fbbf7 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png
index 6238b63312..c7b3008398 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png
index e88ec989de..aff5729698 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png
index b34af16217..4e9fa31187 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png
index a6bb08f870..69f8a410e1 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png
index b70f902383..596831638b 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png
index 102c8c287a..3b3f477732 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png
index 51e2a8be54..72df021919 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png
index 3f82bb7954..8c197a4d51 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
index 40998ed289..aab2c6c838 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
index ea0d0bc1e0..d07a3ce24c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
index 40998ed289..264ac36173 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
index ea0d0bc1e0..940c188a25 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
index 5cb6f5ba66..16f981df00 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
index d605052f08..5861ab01fe 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop.png
index 0857bc6137..0684af1486 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop@2.png
index 30dc205519..cd527b6b6b 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-backdrop@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png
index fd4af1718d..0d6a9add68 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png
index 80120a2a2d..b15be73f42 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png
index ee929e94d2..e3096e32a7 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
index 63e70314b7..f98a612504 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png
index 86bd606af1..68b4da607a 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png
index 25367fc42b..c581b6017d 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
index 40998ed289..264ac36173 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
index ea0d0bc1e0..940c188a25 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png
index 5cb6f5ba66..38c3fd5f80 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png
index d605052f08..5861ab01fe 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png
index a9932e9540..bd9bc0898f 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png
index 7ca9146836..0339022572 100644
Binary files a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png and b/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png
index 445c9d8e52..0fabc78f6b 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png
index ec6bc5cce6..203dd7546b 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png
index 9913626567..6b4481a788 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png
index 0eff13576d..f662c004ee 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
index 995c5e15eb..be444c37e4 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
index 746c3d57d6..43c0051d39 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
index 995c5e15eb..96f958e100 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
index 746c3d57d6..17e3cf681c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
index 4435622e7e..9d65391e7a 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
index ebcc09c055..9279825f6c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop.png
index 932b2f8f9f..5f046a5fea 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop@2.png
index 3eda880147..493551a3e6 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-backdrop@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png
index 935822cca7..35eb4ed6eb 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png
index 03652c8542..fd282e1758 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png
index 1e2b230789..3049a87b72 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
index 4d7923e5ea..3d6e8cc152 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png
index be10b082bd..b04d804dbc 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png
index e55e9ed2dc..4c3c37057e 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
index 995c5e15eb..96f958e100 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
index 746c3d57d6..17e3cf681c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png
index 4435622e7e..9d65391e7a 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png
index ebcc09c055..9279825f6c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png
index c5d54c8b45..9765438611 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png
index b0c0107abe..4ab706ea7c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png
index 75fd3501d9..bec9dd5fd5 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png
index c5d1c9cb3b..09ea3e8345 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png
index 82bbce0ecc..eb18450fb2 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png
index 8b0ee81ebb..9d03abf2a9 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
index b5d8faf6ca..5265bb0d1a 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
index 8a48c4a402..6a53e78f83 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
index b5d8faf6ca..41e42dea11 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
index 8a48c4a402..b3f7bb969b 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
index 12a6814847..4d77a3250c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
index 15a907df9c..72fd024912 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop.png
index 9f8cb5279d..5991a6d9a0 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop@2.png
index 52ff660b20..387b619f96 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-backdrop@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png
index 75c1322a6c..97e4ebdf66 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png
index 1dffb95c18..83ec551058 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png
index ba103c711a..10cd954fdc 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
index ca5014fa9b..5ae5e5dba0 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png
index ab232843fb..100a7142ae 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png
index 27c82f7c2b..8c4bad12d1 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
index b5d8faf6ca..41e42dea11 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
index 8a48c4a402..b3f7bb969b 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png
index 12a6814847..4d77a3250c 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png
index 15a907df9c..72fd024912 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png
index 850add2413..6788fc5ce8 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png differ
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png
index 22c3f1398b..55e82673cb 100644
Binary files a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png and b/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png differ
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index a779c9eb5c..bde7da0bff 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/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; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9d00417f3b..ca5623a6b9 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2677,24 +2677,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: #9d9d99;
box-shadow: none; }
@@ -2795,61 +2797,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.png"), url("assets/slider-horz-scale-has-marks-above@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.png"), url("assets/slider-horz-scale-has-marks-above-hover@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.png"), url("assets/slider-horz-scale-has-marks-above-active@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.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@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.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@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.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@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;
@@ -2858,7 +2866,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;
@@ -2867,7 +2875,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;
@@ -2876,7 +2884,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;
@@ -2885,7 +2893,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;
@@ -2894,7 +2902,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;
@@ -2903,111 +2911,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.png"), url("assets/slider-vert-scale-has-marks-above@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.png"), url("assets/slider-vert-scale-has-marks-above-hover@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.png"), url("assets/slider-vert-scale-has-marks-above-active@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.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@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.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@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.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@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.png"), url("assets/slider-vert-scale-has-marks-below@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.png"), url("assets/slider-vert-scale-has-marks-below-hover@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.png"), url("assets/slider-vert-scale-has-marks-below-active@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.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@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.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@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.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
- background-position: right;
+ background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }