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

2 files changed, 87 insertions, 38 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 3040df8b..16fa9976 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -2933,25 +2933,25 @@ scrollbar,
 .scrollbar {
 	background-image: none;
 	border-style: solid;
-	-GtkRange-trough-border: 0;
+	border-color: shade (@theme_bg_color, 0.94);
+/*	-GtkRange-trough-border: 0; */
 	-GtkScrollbar-has-backward-stepper: true;
 	-GtkScrollbar-has-forward-stepper: true;
-	-GtkRange-stepper-size: 16;
+/*	-GtkRange-stepper-size: 16;
 	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
+	-GtkScrollbar-min-slider-length: 42; *//* minimum size for the slider. sadly can't be in '.slider' where it belongs *//*
 	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
+	-GtkRange-trough-under-steppers: 1;*/
 }
 
-scrollbars-junction,
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
+scrollbar.vertical {
+    border-width: 0px 0px 0px 1px;
+    min-width: 10px;
+}
+
+scrollbar.horizontal {
+    border-width: 1px 0px 0px 0px;
+    min-height: 10px;
 }
 
 scrollbar trough,
@@ -2966,10 +2966,11 @@ placessidebar scrollbar.trough.vertical,
 .sidebar.scrollbar.trough.vertical,
 GtkPlacesSidebar .scrollbar.trough,
 GtkPlacesSidebar .scrollbar.trough.vertical {
+    min-width: 13px;
 	background-image: linear-gradient(to right,
 		@scrollbar_trough,
 		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
+	border-width: 1px 0px 1px 0px;
 	border-style: solid;
 	border-color: shade (@theme_bg_color, 0.94);
 	border-radius: 0;
@@ -2982,33 +2983,61 @@ placessidebar scrollbar trough.horizontal,
 .scrollbar.trough.horizontal,
 .sidebar.scrollbar.trough.horizontal,
 GtkPlacesSidebar .scrollbar.trough.horizontal {
+    min-width: 13px;
 	background-image: linear-gradient(to bottom,
 		@scrollbar_trough,
 		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
+	border-width: 0px 1px 0px 1px;
 	border-style: solid;
 	border-color: shade (@theme_bg_color, 0.94);
 	border-radius: 0;
 	border-image: none;
 }
 
+/* Buttons */
+scrollbar.vertical button {
+    min-width:13px;
+    min-height: 16px;
+    padding: 1px 0px;
+}
+
+scrollbar.horizontal button {
+    min-width:16px;
+    min-height: 13px;
+    padding: 0px 1px;
+}
+
+scrollbar.vertical button.up {
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+scrollbar.vertical button.down {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+scrollbar.horizontal button.up {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+scrollbar.horizontal button.down {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
 scrollbar button,
-scrollbar button:active,
-scrollbar button:active:hover,
+scrollbar button:checked,
+scrollbar button:hover:active,
 scrollbar button:disabled,
 .scrollbar.button,
 .scrollbar.button:active,
-.scrollbar.button:active:hover,
+.scrollbar.button:hover:active,
 .scrollbar.button:disabled {
 	border-style: none;
 	border-image: none;
 	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
 }
 
-scrollbar button:active,
-scrollbar button:active:hover,
+scrollbar button:checked,
+scrollbar button:hover:active,
 .scrollbar.button:active,
 .scrollbar.button:active:hover {
 	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
@@ -3036,12 +3065,19 @@ scrollbar button.left:hover,
 
 scrollbar button,
 .scrollbar.button {
-	color: @theme_fg_color;
+	background-image: linear-gradient(to bottom,
+		shade (@button_active_gradient_color_a, 1.12),
+		shade (@button_active_gradient_color_b, 1.12));
+	background-color: transparent;
 }
 
 scrollbar button:hover,
 .scrollbar.button:hover {
-	color: @theme_fg_color;
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+		shade (@button_active_gradient_color_a, 1.20),
+		shade (@button_active_gradient_color_b, 1.15));
+    color: @theme_selected_bg_color;
 }
 
 scrollbar button:disabled,
@@ -3049,13 +3085,16 @@ scrollbar button:disabled,
 	color: @insensitive_fg_color;
 }
 
-scrollbar button:active,
+scrollbar button:checked,
 .scrollbar.button:active {
 	color: @theme_fg_color;
 }
 
 scrollbar.vertical slider,
 .scrollbar.slider.vertical {
+    min-width: 12px;
+    min-height: 42px;
+    margin: 0px -1px 0px -1px;
 	background-image: linear-gradient(to right,
 		shade(@scrollbar_slider, 0.95),
 		shade(@scrollbar_slider, 0.8));
@@ -3081,6 +3120,9 @@ scrollbar.vertical slider:hover:active,
 
 scrollbar.horizontal slider,
 .scrollbar.slider.horizontal {
+    min-width: 42px;
+    min-height: 12px;
+    margin: -1px 0px -1px 0px;
 	background-image: linear-gradient(to bottom,
 		shade(@scrollbar_slider, 0.95),
 		shade(@scrollbar_slider, 0.8));
@@ -3116,12 +3158,22 @@ scrollbar slider:disabled,
 scrollbar.fine-tune slider:hover:active,
 .scrollbar.slider.fine-tune:hover:active {
 	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
+		shade(@scrollbar_slider, 0.95),
 		shade(@scrollbar_slider, 0.7));
 	border-style: solid;
 	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
+	border-color: shade(@scrollbar_slider, 0.75);
+
+}
+
+scrolledwindow junction,
+.scrollbars-junction { /* the small square between scrollbars!!! */
+	background-image: none;
+	background-color: @theme_bg_color;
+	border-width: 0;
+	border-radius: 0;
+	border-image: none;
+	box-shadow: none;
 }
 
 /*********
@@ -4455,7 +4507,7 @@ GtkProgressBar.osd.progressbar {
 }
 
 .osd iconview.cell:selected,
-.osd iconview.cell:selected:focus
+.osd iconview.cell:selected:focus,
 .osd GtkIconView.cell:selected,
 .osd GtkIconView.cell:selected:focus {
 	background-color: transparent;
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 126a427b..ac957221 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -152,15 +152,12 @@ CajaWindow CajaPlacesSidebar .view row {
     padding: 1px 4px 1px 0px;
 }
 
-/* better for overlay scrollbars */
-.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator,
-.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator,
-CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaEmblemSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
-	-GtkRange-slider-width: 11;
+/* to avoid overlap with eject buttons */
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator,
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator trough,
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator slider,
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator button {
+    min-width: 8px;
 }
 
 .caja-side-pane notebook {