GreenLaguna GTK3: adjust flat buttons in caja, pluma and m-c-c

- adjust transition timings
- adjust mate-panel
- adjust primary-toolbar hover buttons
- theme all variants of caja sidebar

3 files changed, 270 insertions, 126 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
index 721785f2..dc55e129 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
@@ -80,6 +80,10 @@ GtkScale.scale-has-marks-above.slider.vertical:insensitive {
 	border-image: url("assets/button-default-active-border.svg") 3 / 3px stretch;
 }
 
+.toolbar .button:hover,
+.primary-toolbar .button:hover,
+.primary-toolbar .toolbar .button:hover,
+.primary-toolbar.toolbar .button:hover,
 .toolbar .button:checked,
 .primary-toolbar .button:checked,
 .primary-toolbar .toolbar .button:checked,
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index cb97b99b..60d5c603 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -539,7 +539,11 @@ GtkCalendar {
 }
 
 GtkScrolledWindow.frame {
-	background-color: transparent;
+	border-style: solid;
+	border-color: @borders;
+	border-width: 1px;
+	border-radius: 2px;
+	padding: 0;
 }
 
 /* no double frames */
@@ -977,7 +981,30 @@ GtkTreeMenu .menuitem * {
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
-    transition: all 200ms ease-out;
+    transition: all 400ms ease-out;
+}
+
+.button.default {
+    transition: all 400ms ease-out;
+    text-shadow: none;
+    color: @theme_fg_color;
+}
+
+/* ie. mate-control-center */
+.button.flat {
+    transition: all 400ms ease-out;
+    padding: 0px;
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+}
+
+.button.flat:hover {
+    border-radius: 3px;
 }
 
 .button.image-button,
@@ -1302,12 +1329,12 @@ GtkTreeMenu .menuitem * {
 }
 
 .menubar .menuitem {
-    transition: all 200ms ease-out;
+    transition: all 300ms ease-out;
     padding: 3px 7px;
 }
 
 .menu .menuitem {
-    transition: all 200ms ease-out;
+    transition: all 300ms ease-out;
     padding: 3px 4px;
 }
 
@@ -1497,17 +1524,6 @@ GtkTreeMenu .menuitem * {
 	background-color: transparent;
 }
 
-.toolbar .button:hover,
-.primary-toolbar .button:hover,
-.primary-toolbar .toolbar .button:hover,
-.primary-toolbar.toolbar .button:hover {
-	border-style: solid;
-	border-color: shade(@theme_main_color, 0.8);
-	border-radius: 3px;
-	background-image: none;
-	background-color: @theme_bg_color;
-}
-
 .toolbar .button:checked,
 .primary-toolbar .button:checked,
 .primary-toolbar .toolbar .button:checked,
@@ -1520,12 +1536,15 @@ GtkTreeMenu .menuitem * {
 .primary-toolbar .toolbar GtkComboBox .button,
 .primary-toolbar.toolbar GtkComboBox .button {
 	border-radius: 3px;
-
 	background-image: none;
 	/*border-color: shade(@button_border, 1.12);*/
 	/*border-image is defined in gtk-widgets-assets.css*/
 }
 
+.toolbar .button:hover,
+.primary-toolbar .button:hover,
+.primary-toolbar .toolbar .button:hover,
+.primary-toolbar.toolbar .button:hover,
 .toolbar .button:checked:hover,
 .primary-toolbar .button:checked:hover,
 .primary-toolbar .toolbar .button:checked:hover,
@@ -2071,7 +2090,7 @@ GtkPopover .separator {
 	border-style: solid;
 	text-shadow: 0 -1px black;
 
-	color: #D9D9D9;
+	color: #CCD9D0;
 	background-image: -gtk-gradient (radial,
 					0.5 -2.0, 2.0,
 					0.5 -2.0, 3.0,
@@ -2661,7 +2680,10 @@ GtkInfoBar {
 }
 
 /* ie. pluma open dialog */
-.sidebar GtkTreeView row:hover {
+.sidebar GtkTreeView row:hover,
+.sidebar GtkTreeView row:active:hover,
+.sidebar GtkTreeView row:checked:hover,
+.sidebar GtkTreeView row:selected:hover {
 	background-image:  linear-gradient(to bottom,
 	                                  @theme_bg_color,
 	                                  shade(@theme_bg_color, 0.80));
@@ -2813,7 +2835,7 @@ RBSource .cell.image {
 
 NemoView .view,
 NautilusView .view {
-	background-color: shade(@base_color, 1.02)
+	background-color: shade(@base_color, 1.06)
 }
 
 .nautilus-inactive-pane .view,
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
index 364f7d79..d8883ec1 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -2,10 +2,14 @@
  * Caja *
  ************/
 
-/* Look out !
-This is the background color of caja view */
+/*background of icon view */
 CajaView .entry {
-    background-color: shade(@base_color, 1.08);
+    background-color: shade(@base_color, 1.06)
+}
+
+/*background of list view */
+CajaWindow .view {
+    background-color: shade(@base_color, 1.06)
 }
 
 /* FIXME, doesn't work */
@@ -30,12 +34,6 @@ CajaView .entry {
 	border-radius: 0px;
 }
 
-/*FIXME normaly this isn't the right entry for adjusting
-the sidebar background color*/
-CajaWindow .view {
-	background-color: shade(@base_color, 1.03);
-}
-
 /* file renaming */
 CajaView .view .entry,
 CajaView .view .entry:focus {
@@ -52,7 +50,7 @@ CajaView .view .entry:focus {
 
 /* the small line between sidebar and view */
 CajaWindow * {
-	-GtkPaned-handle-size: 1px;
+    -GtkPaned-handle-size: 2px;
 }
 
 CajaWindow GtkScrolledWindow.frame {
@@ -97,44 +95,86 @@ CajaWindow .notebook .rubberband {
 	border-radius: 6px;
 }
 
-/* FIXME, Why this doesn't work with caja? */
-CajaWindow .sidebar .view {
-	background-color: shade(@theme_bg_color, 1.03);
-	border-width: 0px;
+/* Caja places bar */
+CajaWindow .button.flat {
+    border-style: solid;
+    border-color: shade(@button_border, 1.1);
+    border-radius: 3px;
+    padding: 2px 5px;
 }
 
-CajaWindow .sidebar .frame {
-	border-width: 0px;
+CajaWindow .button.flat:hover {
+    border-radius: 3px;
+    padding: 2px 5px;
 }
 
-CajaWindow .sidebar .scrollbar.button {
-	color: transparent;
+/* caja sidebar */
+CajaWindow FMTreeView .view,
+CajaWindow CajaNotesViewer .view,
+CajaWindow CajaPlacesSidebar .view,
+CajaWindow CajaHistorySidebar .view,
+CajaWindow CajaInformationPanel GtkVBox,
+CajaWindow CajaEmblemSidebar GtkViewport {
+    background-color: shade(@theme_bg_color, 1.03);
+    border-width: 0px;
 }
 
-CajaWindow .sidebar .scrollbar.button:hover {
-	color: @theme_fg_color;
+CajaWindow FMTreeView .frame,
+CajaWindow CajaNotesViewer .frame,
+CajaWindow CajaPlacesSidebar .frame,
+CajaWindow CajaHistorySidebar .frame,
+CajaWindow CajaEmblemSidebar .frame {
+    border-width: 0px;
+}
+
+CajaWindow FMTreeView .scrollbar.button,
+CajaWindow CajaNotesViewer .scrollbar.button,
+CajaWindow CajaEmblemSidebar .scrollbar.button,
+CajaWindow CajaPlacesSidebar .scrollbar.button,
+CajaWindow CajaHistorySidebar .scrollbar.button {
+    color: transparent;
 }
 
+CajaWindow FMTreeView .scrollbar.button:hover,
+CajaWindow CajaNotesViewer .scrollbar.button:hover,
+CajaWindow CajaEmblemSidebar .scrollbar.button:hover,
+CajaWindow CajaPlacesSidebar .scrollbar.button:hover,
+CajaWindow CajaHistorySidebar .scrollbar.button:hover {
+    color: @theme_fg_color;
+}
+
+CajaWindow FMTreeView .cell:selected,
+CajaWindow FMTreeView *.cell:selected,
 CajaPlacesSidebar .cell:selected,
-CajaPlacesSidebar *.cell:selected {
-	background-image:  linear-gradient(to bottom,
-	                                   shade(@theme_bg_color, 1.3),
-	                                   shade(@theme_bg_color, 0.73));
-	color: @theme_text_color;
-	border-radius: 2px;
+CajaPlacesSidebar *.cell:selected,
+CajaWindow CajaHistorySidebar .cell:selected,
+CajaWindow CajaHistorySidebar *.cell:selected {
+    background-image:  linear-gradient(to bottom,
+                                       shade(@theme_bg_color, 1.3),
+                                       shade(@theme_bg_color, 0.73));
+    color: @theme_text_color;
+    border-radius: 2px;
 }
 
+CajaWindow FMTreeView .cell:selected:focus,
+CajaWindow FMTreeView *.cell:selected:focus,
 CajaPlacesSidebar .cell:selected:focus,
-CajaPlacesSidebar *.cell:selected:focus {
-	color: @theme_text_color;
-	background-image:  linear-gradient(to top,
-	                                   shade(@theme_bg_color, 1.3),
-	                                   shade(@theme_bg_color, 0.73));
+CajaPlacesSidebar *.cell:selected:focus,
+CajaWindow CajaHistorySidebar .cell:selected:focus,
+CajaWindow CajaHistorySidebar *.cell:selected:focus {
+    color: @theme_text_color;
+    background-image:  linear-gradient(to top,
+                                       shade(@theme_bg_color, 1.3),
+                                       shade(@theme_bg_color, 0.73));
 }
 
+CajaWindow FMTreeView .cell.image:selected,
+CajaWindow FMTreeView .cell.image:selected:focus,
 CajaPlacesSidebar .cell.image:selected,
-CajaPlacesSidebar .cell.image:selected:focus {
-	color: shade(@theme_selected_bg_color, 0.75);
+CajaPlacesSidebar .cell.image:selected:focus,
+CajaWindow CajaHistorySidebar .cell.image:selected,
+CajaWindow CajaHistorySidebar .cell.image:selected:focus {
+    color: shade(@theme_selected_bg_color, 0.75);
 }
 
 
@@ -180,6 +220,7 @@ CajaWindow .notebook NautilusQueryEditor .toolbar {
 .caja-desktop.nautilus-canvas-item:selected {
 	text-shadow: none;
 }
+
 /****************
  * Mate-Panel *
  ****************/
@@ -211,9 +252,12 @@ PanelMenuBar.menubar * {
 	text-shadow: none;
 }
 
+PanelMenuBar.menubar .menuitem {
+    transition: all 300ms ease-out;
+}
+
 /* set selected menubar button */
 PanelMenuBar.menubar .menuitem:hover {
-    transition: all 300ms ease-out;
 	background-image: none;
 	background-color: shade(@theme_selected_bg_color, 1.1);
 	border-style: none;
@@ -228,7 +272,6 @@ PanelMenuBar.menubar .menuitem:hover {
 PanelMenuBar.menubar .menu .menuitem:checked:hover,
 PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
-    transition: all 300ms ease-out;
 	background-image:  linear-gradient(to bottom,
 	                                  shade(@theme_selected_bg_color, 1.6),
 	                                  shade(@theme_selected_bg_color, 0.6));
@@ -237,7 +280,6 @@ PanelMenuBar.menubar .menu .menuitem:hover {
 	border-width: 1px;
 	border-radius: 3px;
 	border-image: url("assets/menu-border.svg") 2 / 2px stretch;
-	/*border-color: alpha(@theme_selected_bg_color, 0.1);*/
 }
 
 MatePanelApplet {
@@ -245,96 +287,123 @@ MatePanelApplet {
 }
 
 PanelSeparator {
-	border-width: 0;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.96)),
-		to (shade (@theme_bg_color, 1.05)));
-	color: shade (@theme_selected_bg_color, 1.65);
-	text-shadow: none;
+    border-width: 0;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_color, 0.96)),
+                                     to (shade (@theme_bg_color, 1.05)));
+    color: shade (@theme_selected_bg_color, 1.65);
+    text-shadow: none;
 }
 
 /* desktop-applet, clockapplet, drivemount, character-map,
 dictionary */
-MatePanelApplet .button {
-	/* Due to a bug somewhere in gtk or cairo,
-	   a padding of zero (or even one) doesn't work always!!! */
-	padding: 0px;
-
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: none;
-
-	color: @theme_fg_color;
-	background-image: -gtk-gradient (radial,
-					0.5 -2.0, 2.0,
-					0.5 -2.0, 3.0,
-					from (shade(@button_gradient_color_a, 1.5)),
-					to (shade(@button_gradient_color_b, 0.7)));
+MatePanelApplet .button,
+MatePanelApplet .button.flat {
+    transition: all 400ms ease-out;
+    /* Due to a bug somewhere in gtk or cairo,
+       a padding of zero (or even one) doesn't work always!!! */
+    padding: 0px;
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    text-shadow: none;
+    color: @theme_fg_color;
+    background-image: -gtk-gradient (radial,
+                      0.5 -2.0, 2.0,
+                      0.5 -2.0, 3.0,
+                      from (shade(@button_gradient_color_a, 1.5)),
+                      to (shade(@button_gradient_color_b, 0.7)));
 }
 
 MatePanelApplet .button:checked:hover,
 MatePanelApplet .button:checked,
 MatePanelApplet .button:active:hover,
 MatePanelApplet .button:active {
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
+    border-radius: 3px;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
 	                                  @button_gradient_color_b,
 	                                  @button_gradient_color_a);
 }
 
-MatePanelApplet .button:hover {
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
+MatePanelApplet .button:hover,
+MatePanelApplet .button.flat:hover {
+    border-radius: 3px;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
 	                                  @button_gradient_color_b,
 	                                  @button_gradient_color_a);
 }
 
 /*Wncklist */
 WnckTasklist .button {
-	/* Due to a bug somewhere in gtk or cairo,
-	   a padding of zero (or even one) doesn't work always!!! */
-	padding: 2px;
-
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: none;
-
-	color: @theme_fg_color;
-	background-image: -gtk-gradient (radial,
-					0.5 -2.0, 2.0,
-					0.5 -2.0, 3.0,
-					from (shade(@button_gradient_color_a, 1.5)),
-					to (shade(@button_gradient_color_b, 0.7)));
+    transition: all 400ms ease-out;
+    /* Due to a bug somewhere in gtk or cairo,
+       a padding of zero (or even one) doesn't work always!!! */
+    padding: 2px;
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    text-shadow: none;
+    color: @theme_fg_color;
+    background-image: -gtk-gradient (radial,
+                      0.5 -2.0, 2.0,
+                      0.5 -2.0, 3.0,
+                      from (shade(@button_gradient_color_a, 1.5)),
+                      to (shade(@button_gradient_color_b, 0.7)));
 }
 
 WnckTasklist .button:checked:hover,
 WnckTasklist .button:checked,
 WnckTasklist .button:active:hover,
 WnckTasklist .button:active {
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
-	                                  @button_gradient_color_b,
-	                                  @button_gradient_color_a);
+    border-radius: 3px;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_b,
+                                      @button_gradient_color_a);
 }
 
 WnckTasklist .button:hover {
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
-	                                  @button_gradient_color_b,
-	                                  @button_gradient_color_a);
+    border-radius: 3px;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_b,
+                                      @button_gradient_color_a);
+}
+
+/* set button WnckSelector */
+MatePanelApplet > WnckSelector.menubar .menuitem {
+    border-radius: 3px;
+    color: @theme_fg_color;
+    border-style: solid;
+    background-image: -gtk-gradient (radial,
+                      0.5 -2.0, 2.0,
+                      0.5 -2.0, 3.0,
+                      from (shade(@button_gradient_color_a, 1.5)),
+                      to (shade(@button_gradient_color_b, 0.7)));
 }
 
 /* set selected button WnckSelector */
 .mate-panel-window-menu-menu-bar .menuitem:hover,
 MatePanelApplet > WnckSelector.menubar .menuitem:hover {
-	color: @theme_fg_color;
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
-	                                  shade(@button_gradient_color_b, 0.7),
-	                                  @theme_bg_color 50%,
-	                                  shade(@button_gradient_color_a, 1.5));
+    border-radius: 3px;
+    color: @theme_fg_color;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
+                                      shade(@button_gradient_color_b, 0.7),
+                                      @theme_bg_color 50%,
+                                      shade(@button_gradient_color_a, 1.5));
+}
+
+/* set WnckSelector menuitem */
+.mate-panel-window-menu-menu-bar .menu .menuitem,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem {
+    background-image:  none;
+    color: @theme_text_color;
+    border-style: none;
+    border-width: 0px;
+    border-radius: 0px;
 }
 
 /* set WnckSelector selected menuitem */
@@ -365,26 +434,26 @@ WnckPager {
 }
 
 /* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 2.86),
-		shade (@theme_selected_bg_color, 1.0));
-	background-color: @theme_base_color;
+WnckPager:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 2.86),
+                                      shade (@theme_selected_bg_color, 1.0));
+    background-color: @theme_base_color;
 }
 
 /* Classic icon style */
-/*.mate-panel-menu-bar {
-	-PanelMenuBar-icon-visible: true;
-}*/
+.mate-panel-menu-bar {
+    -PanelMenuBar-icon-visible: true;
+}
 
 NaTrayApplet {
-	background-image: none;
-	background-color: @theme_bg_color;
-	padding: 0;
-	color: @theme_fg_color;
-	text-shadow: none;
-/*	-NaTrayApplet-icon-padding: 12;
-	-NaTrayApplet-icon-size: 16;*/
+    background-image: none;
+    background-color: @theme_bg_color;
+    padding: 0;
+    color: @theme_fg_color;
+    text-shadow: none;
+    -NaTrayApplet-icon-padding: 12;
+    -NaTrayApplet-icon-size: 16;
 }
 
 /****************
@@ -398,3 +467,52 @@ TerminalWindow .entry {
     color: @theme_text_color;
 }
 
+/*********
+ * Pluma *
+ *********/
+
+/* Pluma status bar */
+PlumaWindow .button.flat {
+    border-style: solid;
+    border-color: shade(@button_border, 1.1);
+    border-radius: 5px;
+}
+
+PlumaWindow .button.flat,
+PlumaWindow .button.flat:hover {
+    border-radius: 5px;
+}
+
+/* surpress styling of close button */
+PlumaWindow .notebook tab .button.flat,
+PlumaWindow .notebook tab .button.flat:hover {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+}
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+ShellWindow .button.flat {
+    border-image: none;
+}
+
+/* button hover of applications */
+ShellWindow GtkScrolledWindow .button.flat:hover {
+    border-radius: 12px;
+}
+
+/******************************
+ * mate-appearance-properties *
+ ******************************/
+
+/* mate-appearance-properties view */
+GtkDialog GtkScrolledWindow .view {
+    background-color: @theme_main_color;
+}