GTK+-3.20 Menta themes: fix GtkScale after 3.19.11 breakage

2 files changed, 124 insertions, 129 deletions

diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
index 6e1a485e..63d0ca14 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -187,99 +187,98 @@ scale slider:hover,
 	background-image: url("assets/slider-hover.png");
 }
 */
+
 scale slider:disabled,
-scale slider:disabled:hover,
-.scale.slider.horizontal:disabled,
-.scale.slider.horizontal:disabled:hover {
+scale slider:disabled:hover {
 	background-image: url("assets/slider-ins.png");
     background-repeat: no-repeat;
 }
-/*
-.scale.scale-has-marks-above.slider.horizontal {
+
+scale.horizontal.scale-has-marks-above slider {
 	background-image: url("assets/slider.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal:hover {
+scale.horizontal.scale-has-marks-above slider:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
+scale.horizontal.scale-has-marks-above slider:active:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal:disabled:hover {
+scale.horizontal.scale-has-marks-above slider:disabled:hover {
 	background-image: url("assets/slider-ins.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical {
+scale.vertical.scale-has-marks-above slider {
 	background-image: url("assets/slider.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical:hover {
+scale.vertical.scale-has-marks-above slider:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
+scale.vertical.scale-has-marks-above slider:active,
+scale.vertical.scale-has-marks-above slider:active:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical:disabled,
-.scale.scale-has-marks-above.slider.vertical:disabled:hover {
+scale.vertical.scale-has-marks-above slider:disabled,
+scale.vertical.scale-has-marks-above slider:disabled:hover {
 	background-image: url("assets/slider-ins.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal {
+scale.horizontal.scale-has-marks-below slider {
 	background-image: url("assets/slider.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal:hover {
+scale.horizontal.scale-has-marks-below slider:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
+scale.horizontal.scale-has-marks-below slider:active,
+scale.horizontal.scale-has-marks-below slider:active:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal:disabled:hover {
+scale.horizontal.scale-has-marks-below slider:disabled:hover {
 	background-image: url("assets/slider-ins.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical {
+scale.vertical.scale-has-marks-below slider {
 	background-image: url("assets/slider.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical:hover {
+scale.vertical.scale-has-marks-below slider:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
+scale.vertical.scale-has-marks-below slider:active,
+scale.vertical.scale-has-marks-below slider:active:hover {
 	background-image: url("assets/slider-hover.png");
     background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical:disabled,
-.scale.scale-has-marks-below.slider.vertical:disabled:hover {
+scale.vertical.scale-has-marks-below slider:disabled,
+scale.vertical.scale-has-marks-below slider:disabled:hover {
 	background-image: url("assets/slider-ins.png");
     background-repeat: no-repeat;
 }
-*/
+
 /********************************
  * Touch text selection handles *
  ********************************/
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index d35d9071..21fabf28 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -952,146 +952,142 @@ levelbar block.empty,
  * GtkScale *
  ************/
 
-scale,
-.scale {
-/*	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;*/
-}
-
-scale slider,
-scale slider:hover,
-scale slider:disabled,
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:disabled {
-	border-radius: 0;
-	border-style: none;
-	background-color: transparent;
-	/* background-image in -assets variant */
-}
-
-scale.fine-tune slider:active,
-scale.fine-tune slider:active:hover,
-scale.horizontal.fine-tune slider:active,
-scale.horizontal.fine-tune slider:active:hover,
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 80%;
-	background-repeat: no-repeat;
-	background-position: center;
+scale.vertical {
+    min-width: 10px;
 }
 
-scale trough,
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
+scale.horizontal {
+    min-height: 10px;
 }
 
-scale.vertical trough,
-.scale.trough.vertical {
-	margin: 0 6px;
+scale.horizontal trough {
+   min-height: 5px;
+    margin: 8px 0;
+    border-radius: 6px;
 }
 
 scale trough,
-scale trough highlight,
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-scale.vertical trough,
-scale.vertical trough highlight,
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
+scale.vertical trough {
+    min-width: 5px;
+    margin: 0 6px;
+    border-radius: 6px;
 }
 
 scale trough,
-scale.vertical trough,
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
+scale.horizontal trough,
+scale.vertical trough {
+    border-color: @borders;
+    border-style: solid;
+    border-width: 1px;
+    box-shadow: none;
 }
 
-scale trough highlight,
-scale.vertical trough highlight,
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
+scale  trough highlight,
+scale.horizontal  trough highlight,
+scale.vertical trough highlightl {
+    border-color: @scale_highlight_border;
+    border-style: solid;
+    border-width: 1px;
+    background-image: none;
+    box-shadow: none;
+    background-color: @scale_highlight_bg;
 }
 
 scale trough:disabled,
-scale.vertical trough:disabled,
-.scale.trough:disabled,
-.scale.trough.vertical:disabled {
+scale.horizontal trough:disabled,
+scale.vertical trough:disabled {
 	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
+	border-color: shade(@insensitive_scale_borders, 0.75);
 	box-shadow: none;
 	background-image: none;
 }
 
-scale trough highlight:disabled,
-scale.vertical trough highlight:disabled,
-.scale.trough.highlight:disabled,
-.scale.trough.highlight.vertical:disabled {
+scale.horizontal trough highlight:disabled,
+scale.vertical trough highlight:disabled {
 	background-color: shade(@scale_highlight_bg, 1.16);
-	border-color: shade(@insensitive_scale_borders, 1.0);
+	border-color: shade(@insensitive_scale_borders, 0.75);
 	box-shadow: none;
 	background-image: none;
 }
 
-scale trough highlight,
-scale.vertical trough highlight,
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
+/* defines the color of the actuall marks on the scale */
+scale marks indicator {
+	color: alpha(@theme_fg_color, 0.3);
 }
 
-scale progressbar,
-.scale.progressbar {
-	background-color: @scale_progress_fill;
+/* this makes marks visible */
+scale.horizontal indicator,
+scale.horizontal.fine-tune indicator {
+    min-height: 8px;
+    min-width: 1px;
 }
 
-.scale marks separator,
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
+scale.vertical indicator,
+scale.vertical.fine-tune indicator {
+    min-height: 1px;
+    min-width: 8px;
 }
 
-scale trough,
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
+scale slider,
+scale slider:hover,
+scale slider:disabled {
+	border-radius: 8px;
+	border-style: none;
+	background-color: transparent;
+	/* background-image in -assets variant */
+}
+
+scale.vertical slider,
+scale.horizontal slider {
+    background-size: 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+    min-width: 18px;
+    margin: -9px 0px -9px 0px;
+}
+
+scale.horizontal slider {
+    min-width: 18px;
+    margin: -9px 0px -9px 0px;
+}
+
+scale.vertical slider {
+    min-height: 18px;
+    margin: 0px -9px 0px -9px;
+}
+
+scale.vertical.fine-tune slider:active,
+scale.vertical.fine-tune slider:active:hover,
+scale.horizontal.fine-tune slider:active,
+scale.horizontal.fine-tune slider:hover:active {
+	background-size: 80%;
+}
+
+scale.horizontal.scale-has-marks-above.color trough {
+    min-height: 10px;
+    margin: -5px 0px 0px 0px;
+    padding: 1px;
+}
+
+scale.horizontal.scale-has-marks-above.color slider {
+    min-height: 10px;
+     margin: 0px 0px -5px 0px;
+    padding: 9px 0px;
 }
 
-scale.vertical trough,
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
+scale.vertical.scale-has-marks-below.color trough {
+    min-width: 0px;
+    padding: 3px;
 }
 
-scale trough highlight,
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
+scale.vertical.scale-has-marks-below.color slider:hover,
+scale.horizontal.scale-has-marks-above.color slider:hover {
+    background-size: 105%;
 }
 
-scale.vertical trough highlight,
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
+scale.vertical.fine-tune.scale-has-marks-below.color slider,
+scale.horizontal.fine-tune.scale-has-marks-above.color slider {
+    background-size: 90%;
 }
 
 /**********