Gtk+-3.20 Menta themes: re-work borders for frames and other improvements (mega commit)

3 files changed, 131 insertions, 102 deletions

diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index a2a4dcaf..ddbf1314 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -205,6 +205,9 @@ statusbar frame {
 
 statusbar frame {
 	padding: 1px;
+}
+
+statusbar frame border {
     border-style: none;
 }
 
@@ -1156,40 +1159,33 @@ scale.horizontal.fine-tune slider:hover:active {
  * Frames *
  **********/
 
-frame,
-.frame {
+.frame,
+frame > border,  /* firefox location entry */
+filechooser stack > box > scrolledwindow {
 	border-width: 1px;
 	border-color: @borders;
 	border-style: solid;
 	padding: 0;
 }
 
-frame > border,
+.frame.flat,
 frame > border.flat,
-.frame.flat {
-	border-style: none; 
+overlay > frame > border {
+    border-style: none;
 }
 
 scrolledwindow.frame {
     -gtk-icon-style: regular;
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
 	border-radius: 2px;
-	padding: 0;
 }
 
 /* avoid double borders when a viewport is 
  * packed into a GtkScrolledWindow, + avoid double borders in general */
-scrolledwindow viewport.frame,
-frame box stack scrolledwindow {
+scrolledwindow > viewport.frame,
+frame > box > stack > scrolledwindow {
 	border-style: none;
 }
 
-frame box.vertical scrolledwindow.frame {
-    border-width: 1px 0px 1px 0px;
-}
-
 /***********
  * Buttons *
  ***********/
@@ -2079,14 +2075,10 @@ paned.horizontal notebook header.top {
     border-radius: 4px 4px 0px 0px;
     border-style: solid;
     border-color: @borders;
-    border-width: 1px 1px 1px 1px;
+    border-width: 1px 1px 0px 1px;
     box-shadow: none;
 }
 
-paned.horizontal notebook scrolledwindow.frame {
-    border-width: 0px 1px 1px 1px;
-}
-
 paned.horizontal notebook header.top tab {
     padding: 2px 4px;
     margin: 0px 0px 0px -1px;
@@ -2247,6 +2239,11 @@ notebook tab.reorderable-page:hover {
     border-style: none;
 }
 
+ /* ie. caja properties-window notes tab */
+dialog notebook.frame > stack > scrolledwindow.frame {
+     border-style: none;
+}
+
 /* outlines */
 notebook header tab:checked {
     outline-color: @button_default_border_color;
@@ -2590,11 +2587,11 @@ scrollbar.horizontal {
 }
 
 scrollbar trough,
-scrollbar trough.vertical,
+scrollbar.vertical trough,
 .sidebar scrollbar trough,
-.sidebar scrollbar trough.vertical,
-placessidebar scrollbar.trough,
-placessidebar scrollbar.trough.vertical {
+.sidebar scrollbar.vertical trough,
+placessidebar scrollbar trough,
+placessidebar scrollbar.vertical trough {
     min-width: 13px;
 	background-image: linear-gradient(to right,
 		@scrollbar_trough,
@@ -2606,9 +2603,9 @@ placessidebar scrollbar.trough.vertical {
 	border-image: none;
 }
 
-scrollbar trough.horizontal,
-.sidebar scrollbar trough.horizontal,
-placessidebar scrollbar trough.horizontal {
+scrollbar.horizontal trough,
+.sidebar scrollbar.horizontal trough,
+placessidebar scrollbar.horizontal trough {
     min-width: 13px;
 	background-image: linear-gradient(to bottom,
 		@scrollbar_trough,
@@ -2799,13 +2796,12 @@ scrollbar.fine-tune .slider:hover:active {
 }
 
  /* the small square between scrollbars!!! */
-scrolledwindow junction {
+scrolledwindow junction,
+scrolledwindow.frame junction {
 	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
+	background-color: inherit;
+	border-style: none;
 	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
 }
 
 /* junction does not work here */
@@ -3346,14 +3342,6 @@ messagedialog,
 	padding: 0;
 }
 
-/* ie. mate-keyboard-properties option window */
-dialog scrolledwindow {
-    border-color: @borders;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.14);
@@ -3507,6 +3495,31 @@ dialog.background.solid-csd notebook scrolledwindow.frame treeview.view header b
 	box-shadow: none;
 }
 
+/* print dialog */
+printdialog.background > box.view.vertical.dialog-vbox {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+printdialog.background paper {
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 0px;
+    border-color: @borders;
+    background-color: @theme_base_color;
+}
+
+/* filechooser dialog */
+filechooser revealer .vertical.view {
+    background-color: @theme_bg_color;
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
+filechooser actionbar {
+    border-width: 0px 1px 1px 1px;
+}
+
 /***************
  * Search bars *
  ***************/
@@ -3607,6 +3620,7 @@ notebook toolbar.inline-toolbar.horizontal toolitem button.text-button {
  * Sidebar *
  ***********/
 
+treeview.view.sidebar, /*shotwell */
 .sidebar .view,
 placessidebar .view,
 .sidebar {
@@ -4414,37 +4428,43 @@ iconview .cell:selected:focus {
 
 .view text,
 textview,
-.view {
+.view,
+treeview.view {
 	background-color: @theme_base_color;
 	color: @theme_text_color;
 }
 
 .view text selection:disabled,
-.view:disabled {
+.view:disabled,
+treeview.view:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 }
 
 .view text selection,
-.view:selected {
+.view:selected,
+treeview.view:selected {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
 .view text selection:hover,
-.view:hover {
+.view:hover,
+treeview.view:hover {
 	background-color: shade (@theme_selected_bg_color, 1.30);
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
 .view text selection:backdrop,
-.view:selected:backdrop {
+.view:selected:backdrop,
+treeview.view:backdrop {
 	background-color: shade(@theme_unfocused_bg_color, 0.94);
 	color: @theme_fg_color;
 }
 
 /* color of selected icons if unfocused */
-.view:active {
+.view:active,
+treeview.view:active {
     background-color: shade(@theme_unfocused_bg_color, 0.94);
 }
 
@@ -5448,31 +5468,6 @@ messagedialog.csd decoration {
     box-shadow: 0 1px 5px @wm_shadow;
 }
 
-/* print dialog */
-printdialog.background > box.view.vertical.dialog-vbox {
-    background-color: shade (@theme_bg_color, 1.0);
-}
-
-printdialog.background paper {
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 0px;
-    border-color: @borders;
-    background-color: @theme_base_color;
-}
-
-/* filechooser dialog */
-filechooser revealer .vertical.view {
-    background-color: @theme_bg_color;
-    border-style: solid;
-    border-width: 1px 1px 0px 1px;
-    border-color: @borders;
-}
-
-filechooser placessidebar.sidebar.frame {
-    border-style: solid;
-}
-
 /*********
  * Paned *
  *********/
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index a5f8f5db..2830bba3 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -156,19 +156,7 @@
     min-width: 8px;
 }
 
-.caja-side-pane notebook {
-    border-color: @borders;
-    border-style: solid;
-    border-radius: 0px;
-    border-width: 1px 0px 0px 0px;
-}
-
-/* views */
-/* scrolledwindow junction and top border for list view */
-.caja-navigation-window .caja-notebook scrolledwindow.frame {
-	background-color: @theme_bg_color;
-}
-
+/* view modes */
 /* icon and compat mode */
 .caja-navigation-window .caja-notebook scrolledwindow.view.frame  {
     background-color: @theme_base_color;
@@ -200,6 +188,11 @@
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
+/* no double borders if tabs are used */
+.caja-navigation-window .caja-notebook > header.top {
+	border-width: 1px 0px 0px 1px;
+}
+
 /* window and desktop mode */
 .caja-canvas-item {
     border-radius: 3px;
@@ -241,12 +234,13 @@
    text-shadow: none;
 }
 
-/* statusbar */
-.caja-navigation-window statusbar frame {
-    border-style: none;
+/* search, etc */
+/* needed as this is used for firefox locationbar, to avoid double borders */
+.caja-notebook box.vertical > frame > border {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
 }
 
-/* search, etc */
 #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.04);
     background-color: @cluebar_color;
@@ -258,6 +252,18 @@
     color: @theme_fg_color;
 }
 
+/* emblems and background dialog */
+.caja-property-browser > box > box > box > scrolledwindow.frame > viewport.frame {
+    background-color: shade (@theme_bg_color, 1.08);
+}
+
+/* misc */
+/* do we have this style class? */
+.caja-cluebar-label {
+    font-weight: normal;
+    text-shadow: 0 1px shade (@cluebar_color, 1.06);
+}
+
 /****************
  * Mate-Panel *
  ****************/
@@ -480,8 +486,8 @@ PanelApplet.wnck-applet .wnck-pager:hover {
 	border-radius: 3px;
 }
 
-#MatePanelPopupWindow frame {
-	border-radius: 3px;
+#MatePanelPopupWindow frame border {
+    border-radius: 3px;
     border-style: solid;
     border-width: 1px;
     border-color: shade(@borders, 0.95);
@@ -518,22 +524,27 @@ na-tray-applet widget box widget {
     background: transparent;
 }
 
-.mate-panel-applet-slider frame {
+.mate-panel-applet-slider > frame {
     background-color: @theme_bg_color;
+    border-radius:3px;
+    padding: 0px;
+    margin: 0px;
+}
+
+.mate-panel-applet-slider > frame > border {
     border-image: none;
     border-style: solid;
     border-radius:3px;
     padding: 2px;
-    margin: 0px;
 }
 
-.mate-panel-applet-slider frame frame{
+.mate-panel-applet-slider > frame > frame > border {
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider frame button {
+.mate-panel-applet-slider > frame > button {
     color: @theme_fg_color;
 }
 
@@ -707,14 +718,17 @@ window.background.mate-terminal > box.vertical > notebook > header.top tab:check
 }
 
 /* atril and eom */
-EggToolbarEditor.vertical scrolledwindow viewport.frame {
-    background-color: shade (@theme_base_color, 1.0);
+EggToolbarEditor.vertical scrolledwindow {
     border-color: @borders;
     border-width: 1px;
     border-radius: 0px;
     border-style: solid;
 }
 
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
+    background-color: shade (@theme_base_color, 1.0);
+}
+
 /*******
  * Eom *
  *******/
@@ -892,3 +906,19 @@ window.background.mate-terminal > box.vertical > notebook {
     border-width: 0px;
 }
 
+/*************************
+ * mate-power-statistics *
+ *************************/
+
+.mpm-statistics notebook.frame > stack > scrolledwindow.frame {
+     border-style: solid;
+}
+
+/************
+ * engrampa *
+ ************/
+
+.engrampa-window > grid > paned > box > frame > border {
+    border-style: none;
+}
+
diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css
index 00e6622e..26fb99ca 100644
--- a/desktop-themes/Menta/gtk-3.0/other-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/other-applications.css
@@ -51,6 +51,9 @@
 .nemo-window .nemo-window-pane > notebook box.vertical > overlay > scrolledwindow.view,
 .nemo-window .nemo-window-pane > notebook box.vertical > overlay > scrolledwindow > treeview.view {
     background-color: @theme_base_color;
+	border-width: 1px 1px 0px 1px;
+	border-style: solid;
+	border-color: @borders;
 }
 
 .nemo-window-pane treeview.view {
@@ -62,19 +65,20 @@
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
+.nemo-window .nemo-window-pane > notebook > header.top {
+	border-width: 1px 0px 0px 1px;
+}
+
 /* sidebar */
 .nemo-window .sidebar .view {
 	background-color: shade (@theme_bg_color, 1.08);
 	color: @theme_fg_color;
 }
 
-.nemo-window .sidebar scrolledwindow.frame {
-	border-right-width: 1px;
+.nemo-window .sidebar scrolledwindow.frame.nemo-places-sidebar {
+	border-width: 1px 1px 0px 1px;
 	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
+	border-color: @borders;
 }
 
 .nemo-window .sidebar treeview .cell:selected {