Gtk+-3.20 GreenLaguna: re-work borders of frame and other improvements

5 files changed, 119 insertions, 120 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
index 0e0bd145..5035bfd1 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
@@ -63,26 +63,45 @@ RBSource .cell.image {
     text-shadow: none;
 }
 
+/* nautilus view */
+.nautilus-window > grid > paned.horizontal scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+    -gtk-icon-style: regular;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
+    border-width: 0px 1px 1px 1px;
+    border-radius: 2px;
+    padding: 0;
+}
+
+/* sidebar */
+.nautilus-window placessidebar.sidebar.frame {
+    border-width: 0px 1px 1px 1px;
+}
+
 /*********
  * Gedit *
  *********/
 
-.gedit-side-panel-paned {
-    margin: 0px -2px 0px -2px;
-}
-
-.gedit-side-panel-paned viewport.frame {
+.gedit-side-panel-paned scrolledwindow {
     border-width: 0px 1px 1px 1px;
     border-style: solid;
     border-color: alpha(@frame_color, 0.6);
 }
 
+/* file-browser */
+.gedit-side-panel-paned > box > stack > grid > scrolledwindow {
+    border-width: 1px;
+}
+
 .gedit-bottom-panel-paned > grid > notebook scrolledwindow {
     background-color: shade(@base_color, 1.04);
     border-style: solid;
     border-color: alpha(@frame_color, 0.6);
     border-width: 0px 1px 1px 1px;
     border-radius: 2px;
+    -gtk-icon-style: regular;
+    padding: 0;
 }
 
 /* gnome-weather */
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
index 177aad04..b9486ab7 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
@@ -80,8 +80,8 @@
 @define-color expander_row_selected_color #DFF0D9; /*#acccee*/
 
 @define-color link_color #679E36;
-@define-color frame_color #9FA09E;
-@define-color inactive_frame_color #C8CAC8;
+@define-color frame_color #A8BD95;
+@define-color inactive_frame_color #BECAB4;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #4e9a06;
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 015f3fb4..f3f24edf 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -48,9 +48,10 @@
     text-shadow: none;
 }
 
+/* seems like firefox needs this stupid wildcard in several places */
 *:selected:focus {
-/*    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;*/
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
     text-shadow: none;
 }
 
@@ -101,6 +102,17 @@
   font-family: Monospace;
 }
 
+image,
+image:disabled,
+label,
+label:disabled,
+box,
+box:disabled,
+grid,
+grid:disabled {
+	background-color: transparent;
+}
+
 /************
  * Tooltips *
  ************/
@@ -490,8 +502,8 @@ label selection:backdrop:disabled {
 treeview separator,
 separator,
 .separator {
-    color: darker (@theme_bg_color);
-	background-color: darker (@theme_bg_color);
+    color: alpha(@frame_color, 0.6);
+	background-color: alpha(@frame_color, 0.6);
 }
 
 paned > separator {
@@ -804,7 +816,9 @@ progressbar.vertical trough {
  * Frames *
  **********/
 
-frame {
+.frame,
+frame > border,  /* firefox location entry */
+filechooser stack > box > scrolledwindow {
     background-color: shade(@base_color, 1.02);
     color: lighter (@theme_fg_color);
     border-style: solid;
@@ -814,39 +828,23 @@ frame {
     padding: 0px;
 }
 
-.frame.flat
-frame.flat {
+.frame.flat,
+frame > border.flat,
+overlay > frame > border {
     border-style: none;
 }
 
-/* ie, dconf-editor, nautilus view */
-.background.csd scrolledwindow,
-.gedit-bottom-panel-paned > grid > notebook scrolledwindow,
-.background.solid-csd > grid > paned.horizontal scrolledwindow {
-    background-color: shade(@base_color, 1.04);
-    -gtk-icon-style: regular;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-    border-width: 0px 1px 1px 1px;
-    border-radius: 2px;
-    padding: 0;
-}
-
 /*scrolledwindow,*/
-scrolledwindow.frame,
-.background.csd scrolledwindow.frame,
-.background.solid-csd scrolledwindow.frame {
+scrolledwindow.frame {
     -gtk-icon-style: regular;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-    border-width: 1px;
     border-radius: 2px;
-    padding: 0;
 }
 
-/* no double frames */
-scrolledwindow viewport.frame {
-    border-style: none;
+/* avoid double borders when a viewport is 
+ * packed into a GtkScrolledWindow, + avoid double borders in general */
+scrolledwindow > viewport.frame,
+scrolledwindow.frame > viewport.frame {
+	border-style: none;
 }
 
 /***************
@@ -1038,13 +1036,6 @@ paned.horizontal > paned.vertical > notebook > header.top {
     box-shadow: none;
 }
 
-paned.horizontal > box.vertical > notebook scrolledwindow.frame,
-paned.horizontal > paned.vertical > notebook scrolledwindow.frame {
-    border-width: 1px 1px 1px 1px;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-}
-
 .gedit-bottom-panel-paned > grid > notebook > header tab,
 window.background > notebook > header tab,
 paned.horizontal > notebook > header tab,
@@ -1327,6 +1318,11 @@ notebook tab.reorderable-page:checked {
     border-style: solid;
 }
 
+ /* ie. caja properties-window notes tab */
+dialog notebook.frame > stack > scrolledwindow.frame {
+     border-style: none;
+}
+
 /* outlines */
 notebook header.top tab:checked {
     -gtk-outline-top-left-radius: 3px;
@@ -1832,6 +1828,7 @@ combobox > box > button.combo > box > arrow:disabled {
 
 button {
     -gtk-icon-style: regular;
+    -gtk-outline-radius: 3px;
     padding: 3px;
     border-radius: 3px;
     border-width: 1px;
@@ -3711,32 +3708,6 @@ statusbar {
     font-size: smaller;
 }
 
-statusbar frame {
-    border-style: none;
-}
-
-scrolledwindow,
-overlay /* for floating bars */ {
-    background-color: transparent;
-}
-
-image,
-image:hover,
-image:checked,
-image:hover:active,
-image:disabled,
-label,
-label:hover,
-label:checked,
-label:hover:active,
-label:disabled,
-box,
-box:disabled,
-grid,
-grid:disabled {
-    background-color: transparent;
-}
-
 /*****************
  * Color Chooser *
  *****************/
@@ -4295,13 +4266,15 @@ infobar revealer button label {
 .dim-label,
 .dim-label:hover,
 .dim-label:focus,
-.view.dim-label {
+.view.dim-label,
+list row.activatable .dim-label {
     color: mix (@theme_fg_color, @theme_bg_color, 0.50);
 }
 
 .dim-label:selected,
-.dim-label:selected:focus {
-    color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
+.dim-label:selected:focus,
+list row.activatable:selected .dim-label {
+    color: mix (@theme_selected_bg_color, @theme_base_color, 0.60);
     text-shadow: none;
 }
 
@@ -4336,16 +4309,6 @@ placessidebar.sidebar {
 }
 
 /* dialog open, nautilus */
-placessidebar.sidebar.frame {
-    border-width: 0px 1px 1px 1px;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-}
-
-filechooser placessidebar.sidebar.frame {
-    border-width: 1px 1px 1px 1px;
-}
-
 placessidebar.sidebar.frame > viewport.frame > list > row.activatable.sidebar-row {
     background-color: shade(@theme_bg_color, 1.02);
     border-radius: 0px;
@@ -4388,9 +4351,6 @@ placessidebar.sidebar.frame > viewport.frame > list row.activatable button.sideb
 .sidebar separator,
 .sidebar separator:hover {
     min-height: 1px;
-    background-image: linear-gradient(to bottom,
-                                      alpha(@frame_color, 0.6),
-                                      alpha(@frame_color, 0.6));
 }
 
 /* ie. dconf-editor */
@@ -4441,11 +4401,6 @@ filechooser #pathbarbox button {
     padding: 4px;
 }
 
-/* avoid double borders */
-filechooser placesview stack frame {
-    border-style: none;
-}
-
 filechooser stack scrolledwindow {
     background-color: shade(@theme_bg_color, 1.02);
     border-color: alpha(@frame_color, 0.6);
@@ -4454,6 +4409,9 @@ filechooser stack scrolledwindow {
     border-radius: 0px;
 }
 
+filechooser actionbar {
+    border-width: 0px 1px 1px 1px;
+}
 
 /****************
  * GtkActionBar *
@@ -4496,14 +4454,6 @@ button.link:link:focus:hover:active {
  * Dialog Windows *
  ******************/
 
-/* ie. mate-keyboard-properties option window */
-dialog scrolledwindow.frame {
-    border-color: alpha(@frame_color, 0.6);
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 dialog scrolledwindow.frame viewport .vertical {
     background-color: shade (@theme_bg_color, 1.03);
 }
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
index bf71736c..3e14302f 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -85,17 +85,15 @@
 }
 
 /* eventbars, ie. search results */
-.caja-notebook box.vertical frame {
-    background-color: shade (@theme_bg_color, 1.02);
-    border-style: none;
-    border-radius: 0px;
+/* 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;
+    border-radius: 3px 3px 0px 0px;
 }
 
 .caja-notebook #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.02);
-    border-color: @notebook_border;
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
     border-radius: 3px 3px 0px 0px;
 }
 
@@ -464,15 +462,6 @@ vte-terminal {
     background-color: @theme_bg_color;
 }
 
-/* atril and eom */
-EggToolbarEditor.vertical scrolledwindow .frame {
-    background-color: shade(@base_color, 1.04);
-    border-color: @borders;
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
-}
-
 /*******
  * Eom *
  *******/
@@ -519,6 +508,14 @@ EggToolbarEditor.vertical scrolledwindow .frame {
  * Atril *
  *********/
 
+.atril-window .primary-toolbar toolbar entry {
+    padding: 0px;
+}
+
+.atril-window paned.horizontal > box.vertical > scrolledwindow.frame {
+    border-width: 0px 1px 1px 1px;
+}
+
 /* broken text selection */
 .atril-window scrolledwindow.frame > widget:selected {
 	background-color: @theme_selected_bg_color;
@@ -530,7 +527,26 @@ EggToolbarEditor.vertical scrolledwindow .frame {
 	color: @theme_fg_color;
 }
 
-/* Mate Font Viewer */
+/* sidebar */
+.atril-window paned.horizontal > box.vertical > box.horizontal button {
+    padding: 3px;
+    border-radius: 3px;
+    -gtk-outline-radius: 3px;
+}
+
+/* atril and eom */
+EggToolbarEditor.vertical scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+    border-color: alpha(@frame_color, 0.6);
+    border-width: 1px;
+    border-radius: 0px;
+    border-style: solid;
+}
+
+
+/********************
+ * Mate Font Viewer *
+ ********************/
 
 .font-viewer notebook.frame {
     border-style: none;
@@ -622,3 +638,18 @@ window.background.mate-terminal > box.vertical > notebook {
     border-width: 0px;
 }
 
+/***********************
+ * mate-volume-control *
+ ***********************/
+
+GvcMixerDialog > box.vertical.dialog-vbox > box.horizontal > box.horizontal > frame {
+    border-color: alpha(@frame_color, 0.6);
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px
+}
+
+GvcMixerDialog > box.vertical.dialog-vbox > notebook.frame scrolledwindow.frame {
+    border-style: none;
+}
+
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
index 2154f06c..ecb8e9cf 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
@@ -59,10 +59,9 @@
     font-style: italic;
 }
 
-.nemo-window box.toolbar.horizontal {
-    border-style: solid;
-    border-width: 0 1px 0 0;
-    border-color: shade(@toolbar_gradient_base, 0.98);
+/* weird line between views and statusbar */
+.nemo-window grid.vertical separator {
+    background-color: transparent;
 }
 
 .nemo-window-pane .question,