Gtk+-3.20 Menta themes: change pathbar settings in caja to follow latest changes in master

6 files changed, 138 insertions, 94 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
index 7a09636e..c67fb3a4 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -75,6 +75,8 @@ button:hover,
 toolbar button:hover,
 toolbar .raised button:hover,
 toolbar combobox button.combo:hover,
+combobox button.combo:hover,
+toolbar.primary-toolbar combobox button.combo:hover,
 toolbar.primary-toolbar.horizontal > toolitem > .linked > button.raised.image-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
@@ -111,9 +113,7 @@ toolbar combobox button.combo:checked:disabled {
 
 /* Entry background */
 entry,
-combobox button.combo:hover,
 toolbar.primary-toolbar combobox entry.combo,
-toolbar.primary-toolbar combobox button.combo:hover,
 levelbar trough {
 	background-image: linear-gradient(to bottom,
 		@entry_background_a,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
index 6e494ca3..d8625f7a 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -166,8 +166,8 @@ toolbar.primary-toolbar button:checked,
 toolbar.primary-toolbar .raised button:checked,
 toolbar.inline-toolbar .button:checked,
 toolbar.primary-toolbar switch trough {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -178,8 +178,8 @@ toolbar.primary-toolbar .raised button.default:disabled,
 toolbar.primary-toolbar switch trough:disabled,
 toolbar.primary-toolbar switch trough:checked:disabled,
 toolbar.primary-toolbar combobox button.combo:disabled {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -191,7 +191,7 @@ toolbar.primary-toolbar entry:focus,
 toolbar.primary-toolbar combobox entry.combo:focus,
 toolbar.primary-toolbar .raised button.default:checked,
 toolbar.inline-toolbar button.default:checked {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
@@ -202,8 +202,8 @@ toolbar.inline-toolbar button.default:checked {
 toolbar.primary-toolbar .raised button,
 toolbar.inline-toolbar button,
 toolbar.primary-toolbar combobox button.combo {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -212,8 +212,8 @@ toolbar.primary-toolbar combobox button.combo {
 /* primary toolbar - focused button borders */
 toolbar.primary-toolbar .raised button.default,
 toolbar.inline-toolbar button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-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 b9b40449..a975b2c4 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -17,30 +17,24 @@
                                       @button_hover_gradient_color_b);
 }
 
-.caja-navigation-window .caja-side-pane button.flat:first-child {
+.caja-navigation-window .caja-side-pane button.flat:first-child,
+.caja-navigation-window .caja-side-pane button.flat:hover:first-child {
+    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
     border-radius: 3px 0 0 3px;
-    border-right-width: 0;
-/* remove right border */
-    border-image: url("borders/button.png") 3 4 4 3 / 3px 0px 4px 3px stretch;
+    /* remove right border */
+    border-width: 2px 0px 2px 2px;
+	border-image-width: 3px 0 4px 4px;
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.caja-navigation-window .caja-side-pane button.flat:last-child {
+.caja-navigation-window .caja-side-pane button.flat:last-child,
+.caja-navigation-window .caja-side-pane button.flat:hover:last-child {
+    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
     border-radius: 0 3px 3px 0;
-    border-left-width: 0;
-/* remove left border */
-    border-image: url("borders/button.png") 3 3 4 4 / 3px 3px 4px 0px stretch;
-}
-
-.caja-navigation-window .caja-side-pane button.flat:hover:first-child {
-    border-radius: 6px 0 0 6px;
-    border-right-width: 0;
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 0px 4px 3px stretch;
-}
-
-.caja-navigation-window .caja-side-pane button.flat:hover:last-child  {
-    border-radius: 0 6px 6px 0;
-    border-left-width: 0;
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 0px stretch;
+    /* remove left border */
+    border-width: 2px 2px 2px 0px;
+	border-image-width: 3px 4px 4px 0px;
+	box-shadow: inset 1px 0 @inset_light_color;
 }
 
 /* ComboBox views */
@@ -48,37 +42,65 @@
     padding: 6px 4px;
 }
 
+/* pathpar toggle button */
+.caja-navigation-window button.toggle.image-button,
+.caja-navigation-window button.toggle.image-button:checked {
+    padding: 5px;
+    border-radius: 3px;
+}
+
 /* pathbar */
+/* pathbar buttons */
+.caja-pathbar button {
+    padding: 4px;
+}
+
 /* arrow button */
-.caja-pathbar button:nth-child(odd) widget {
-    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+.caja-pathbar button.slider-button:focus {
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 }
 
-.caja-pathbar button:nth-child(odd) {
-   margin: 0px -7px 0px 0px;
-   padding: 0px;
+.caja-pathbar button.slider-button:nth-child(odd) {
+    border-radius: 3px 0px 0px 3px;
+    /* remove right border */
+    border-width: 2px 0px 2px 2px;
+	border-image-width: 3px 0 4px 4px;
+    margin: 0px -1px 0px 1px;
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.caja-pathbar button:nth-child(even) widget {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+.caja-pathbar button.slider-button:nth-child(even) {
+    border-radius: 0 3px 3px 0;
+    /* remove left border */
+    border-width: 2px 2px 2px 0px;
+	border-image-width: 3px 4px 4px 0;
+    margin: 0px 1px 0px -1px;
+	box-shadow: inset 1px 0 @inset_light_color;
 }
 
-.caja-pathbar button:nth-child(even) {
-   margin: 0px 0px 0px -7px;
-  padding: 0px;
+/* remove box shadow from last-child */
+.caja-pathbar button.slider-button:disabled:nth-child(even) {
+	box-shadow: none;
 }
 
 /* folder buttons */
-.caja-pathbar button.toggle {
-   margin: 0px -8px 0px 0px;
+.caja-pathbar button.toggle.text-button,
+.caja-pathbar button.toggle.text-button.image-button {
+    border-width: 2px 0px;
+	border-image-width: 3px 0 4px 0;
+	border-radius: 0;
+    margin: 0px -2px 0px -2px;
+	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
 }
 
-.caja-pathbar button.toggle image {
-   padding: 0px 4px 0px 5px;
+.caja-pathbar button.toggle.text-button:checked,
+.caja-pathbar button.toggle.text-button.image-button:checked {
+	box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-.caja-pathbar button.toggle label {
-   padding: 0px 5px;
+.caja-pathbar button.toggle.text-button:disabled,
+.caja-pathbar button.toggle.text-button.image-button:disabled {
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
 /* places, treeview, history, information, emblems and notes */
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
index 7a09636e..c67fb3a4 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -75,6 +75,8 @@ button:hover,
 toolbar button:hover,
 toolbar .raised button:hover,
 toolbar combobox button.combo:hover,
+combobox button.combo:hover,
+toolbar.primary-toolbar combobox button.combo:hover,
 toolbar.primary-toolbar.horizontal > toolitem > .linked > button.raised.image-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
@@ -111,9 +113,7 @@ toolbar combobox button.combo:checked:disabled {
 
 /* Entry background */
 entry,
-combobox button.combo:hover,
 toolbar.primary-toolbar combobox entry.combo,
-toolbar.primary-toolbar combobox button.combo:hover,
 levelbar trough {
 	background-image: linear-gradient(to bottom,
 		@entry_background_a,
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
index 6e494ca3..d8625f7a 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -166,8 +166,8 @@ toolbar.primary-toolbar button:checked,
 toolbar.primary-toolbar .raised button:checked,
 toolbar.inline-toolbar .button:checked,
 toolbar.primary-toolbar switch trough {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -178,8 +178,8 @@ toolbar.primary-toolbar .raised button.default:disabled,
 toolbar.primary-toolbar switch trough:disabled,
 toolbar.primary-toolbar switch trough:checked:disabled,
 toolbar.primary-toolbar combobox button.combo:disabled {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -191,7 +191,7 @@ toolbar.primary-toolbar entry:focus,
 toolbar.primary-toolbar combobox entry.combo:focus,
 toolbar.primary-toolbar .raised button.default:checked,
 toolbar.inline-toolbar button.default:checked {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
@@ -202,8 +202,8 @@ toolbar.inline-toolbar button.default:checked {
 toolbar.primary-toolbar .raised button,
 toolbar.inline-toolbar button,
 toolbar.primary-toolbar combobox button.combo {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -212,8 +212,8 @@ toolbar.primary-toolbar combobox button.combo {
 /* primary toolbar - focused button borders */
 toolbar.primary-toolbar .raised button.default,
 toolbar.inline-toolbar button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
+	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 43b50c6a..a0ee6228 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -17,30 +17,24 @@
                                       @button_hover_gradient_color_b);
 }
 
-.caja-navigation-window .caja-side-pane button.flat:first-child {
+.caja-navigation-window .caja-side-pane button.flat:first-child,
+.caja-navigation-window .caja-side-pane button.flat:hover:first-child {
+    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
     border-radius: 3px 0 0 3px;
-    border-right-width: 0;
-/* remove right border */
-    border-image: url("borders/button.png") 3 4 4 3 / 3px 0px 4px 3px stretch;
+    /* remove right border */
+    border-width: 2px 0px 2px 2px;
+	border-image-width: 3px 0 4px 4px;
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.caja-navigation-window .caja-side-pane button.flat:last-child {
+.caja-navigation-window .caja-side-pane button.flat:last-child,
+.caja-navigation-window .caja-side-pane button.flat:hover:last-child {
+    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
     border-radius: 0 3px 3px 0;
-    border-left-width: 0;
-/* remove left border */
-    border-image: url("borders/button.png") 3 3 4 4 / 3px 3px 4px 0px stretch;
-}
-
-.caja-navigation-window .caja-side-pane button.flat:hover:first-child {
-    border-radius: 6px 0 0 6px;
-    border-right-width: 0;
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 0px 4px 3px stretch;
-}
-
-.caja-navigation-window .caja-side-pane button.flat:hover:last-child  {
-    border-radius: 0 6px 6px 0;
-    border-left-width: 0;
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 0px stretch;
+    /* remove left border */
+    border-width: 2px 2px 2px 0px;
+	border-image-width: 3px 4px 4px 0px;
+	box-shadow: inset 1px 0 @inset_light_color;
 }
 
 /* ComboBox views */
@@ -48,37 +42,65 @@
     padding: 6px 4px;
 }
 
+/* pathpar toggle button */
+.caja-navigation-window button.toggle.image-button,
+.caja-navigation-window button.toggle.image-button:checked {
+    padding: 5px;
+    border-radius: 3px;
+}
+
 /* pathbar */
+/* pathbar buttons */
+.caja-pathbar button {
+    padding: 4px;
+}
+
 /* arrow button */
-.caja-pathbar button:nth-child(odd) widget {
-    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+.caja-pathbar button.slider-button:focus {
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 }
 
-.caja-pathbar button:nth-child(odd) {
-   margin: 0px -7px 0px 0px;
-   padding: 0px;
+.caja-pathbar button.slider-button:nth-child(odd) {
+    border-radius: 3px 0px 0px 3px;
+    /* remove right border */
+    border-width: 2px 0px 2px 2px;
+	border-image-width: 3px 0 4px 4px;
+    margin: 0px -1px 0px 1px;
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.caja-pathbar button:nth-child(even) widget {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+.caja-pathbar button.slider-button:nth-child(even) {
+    border-radius: 0 3px 3px 0;
+    /* remove left border */
+    border-width: 2px 2px 2px 0px;
+	border-image-width: 3px 4px 4px 0;
+    margin: 0px 1px 0px -1px;
+	box-shadow: inset 1px 0 @inset_light_color;
 }
 
-.caja-pathbar button:nth-child(even) {
-   margin: 0px 0px 0px -7px;
-  padding: 0px;
+/* remove box shadow from last-child */
+.caja-pathbar button.slider-button:disabled:nth-child(even) {
+	box-shadow: none;
 }
 
 /* folder buttons */
-.caja-pathbar button.toggle {
-   margin: 0px -8px 0px 0px;
+.caja-pathbar button.toggle.text-button,
+.caja-pathbar button.toggle.text-button.image-button {
+    border-width: 2px 0px;
+	border-image-width: 3px 0 4px 0;
+	border-radius: 0;
+    margin: 0px -2px 0px -2px;
+	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
 }
 
-.caja-pathbar button.toggle image {
-   padding: 0px 4px 0px 5px;
+.caja-pathbar button.toggle.text-button:checked,
+.caja-pathbar button.toggle.text-button.image-button:checked {
+	box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-.caja-pathbar button.toggle label {
-   padding: 0px 5px;
+.caja-pathbar button.toggle.text-button:disabled,
+.caja-pathbar button.toggle.text-button.image-button:disabled {
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
 /* places, treeview, history, information, emblems and notes */