GTK+-3.20 traditional themes: adjust width of scrollbars

4 files changed, 46 insertions, 32 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index 2cfcea83..44b1c032 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -1820,12 +1820,12 @@ scrollbar {
 
 scrollbar.vertical {
     border-width: 0px 0px 0px 1px;
-    min-width: 15px;
+    min-width: 14px;
 }
 
 scrollbar.horizontal {
     border-width: 1px 0px 0px 0px;
-    min-height: 15px;
+    min-height: 14px;
 }
 
 scrollbar trough {
@@ -1839,7 +1839,7 @@ scrolledwindow junction {
 }
 
 scrollbar.horizontal trough {
-    min-height: 15px;
+    min-height: 14px;
     border-radius: 0px;
     border-width: 0px 1px 0px 1px;
     border-image: none;
@@ -1851,7 +1851,7 @@ scrollbar.horizontal trough {
 }
 
 scrollbar.vertical trough {
-    min-width: 15px;
+    min-width: 14px;
     border-radius: 0px;
     border-width: 1px 0px 1px 0px;
     border-image: none;
@@ -1864,14 +1864,14 @@ scrollbar.vertical trough {
 
 /* Buttons */
 scrollbar.vertical button {
-    min-width: 15px;
-    min-height: 17px;
+    min-width: 14px;
+    min-height: 16px;
     padding: 1px 0px;
 }
 
 scrollbar.horizontal button {
-    min-width: 17px;
-    min-height: 15px;
+    min-width: 16px;
+    min-height: 14px;
     padding: 0px 1px;
 }
 
@@ -1966,14 +1966,14 @@ scrollbar.vertical button:hover:active {
 }
 
 scrollbar.vertical slider {
-    min-width: 15px;
+    min-width: 14px;
     min-height: 42px;
     margin: 0px -1px 0px -1px;
 }
 
 scrollbar.horizontal slider {
     min-width: 42px;
-    min-height: 15px;
+    min-height: 14px;
     margin: -1px 0px -1px 0px;
 }
 
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
index fee642b9..4b8221ef 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
@@ -12,16 +12,23 @@
     color: @theme_fg_color;
 }
 
-/* moved eject button to left better for overlay scrollbars */
-.caja-side-pane treeview {
- /*   padding: 0px 4px 0px 0px; sigh, broken*/
+/* move whole the frame, to free eject button for overlay scrollbars */
+.caja-side-pane scrolledwindow.frame {
+    padding: 0px;
+    margin: 0px 0px 0px -8px;
+}
+
+.caja-side-pane scrolledwindow.frame treeview.view {
     padding: 3px 0px 3px 0px;
 }
 
 /* better for overlay scrollbars */
-.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator,
-.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator {
-/*    -GtkRange-slider-width: 13; */
+/* to avoid overlap with eject buttons */
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator,
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator trough,
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator slider,
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator button {
+    min-width: 13px;
 }
 
 /* ComboBox views */
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 681afb2e..4f1aadf2 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -1821,12 +1821,12 @@ scrollbar {
 
 scrollbar.vertical {
     border-width: 0px 0px 0px 1px;
-    min-width: 15px;
+    min-width: 14px;
 }
 
 scrollbar.horizontal {
     border-width: 1px 0px 0px 0px;
-    min-height: 15px;
+    min-height: 14px;
 }
 
 scrollbar trough {
@@ -1840,7 +1840,7 @@ scrolledwindow junction {
 }
 
 scrollbar.horizontal trough {
-    min-height: 15px;
+    min-height: 14px;
     border-radius: 0px;
     border-width: 0px 1px 0px 1px;
     border-image: none;
@@ -1852,7 +1852,7 @@ scrollbar.horizontal trough {
 }
 
 scrollbar.vertical trough {
-    min-width: 15px;
+    min-width: 14px;
     border-radius: 0px;
     border-width: 1px 0px 1px 0px;
     border-image: none;
@@ -1865,14 +1865,14 @@ scrollbar.vertical trough {
 
 /* Buttons */
 scrollbar.vertical button {
-    min-width: 15px;
-    min-height: 17px;
+    min-width: 14px;
+    min-height: 16px;
     padding: 1px 0px;
 }
 
 scrollbar.horizontal button {
-    min-width: 17px;
-    min-height: 15px;
+    min-width: 16px;
+    min-height: 14px;
     padding: 0px 1px;
 }
 
@@ -1967,14 +1967,14 @@ scrollbar.vertical button:hover:active {
 }
 
 scrollbar.vertical slider {
-    min-width: 15px;
+    min-width: 14px;
     min-height: 42px;
     margin: 0px -1px 0px -1px;
 }
 
 scrollbar.horizontal slider {
     min-width: 42px;
-    min-height: 15px;
+    min-height: 14px;
     margin: -1px 0px -1px 0px;
 }
 
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
index 2c44d829..ce58e2c8 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -12,16 +12,23 @@
     color: @theme_fg_color;
 }
 
-/* moved eject button to left better for overlay scrollbars */
-.caja-side-pane treeview {
- /*   padding: 0px 4px 0px 0px; sigh, broken*/
+/* move whole the frame, to free eject button for overlay scrollbars */
+.caja-side-pane scrolledwindow.frame {
+    padding: 0px;
+    margin: 0px 0px 0px -8px;
+}
+
+.caja-side-pane scrolledwindow.frame treeview.view {
     padding: 3px 0px 3px 0px;
 }
 
 /* better for overlay scrollbars */
-.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator,
-.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator {
-/*    -GtkRange-slider-width: 13; */
+/* to avoid overlap with eject buttons */
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator,
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator trough,
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator slider,
+.caja-side-pane scrolledwindow scrollbar.vertical.right.overlay-indicator button {
+    min-width: 13px;
 }
 
 /* ComboBox views */