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
- add mate-applications.css

4 files changed, 585 insertions, 27 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am b/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
index f892f55b..bb98d6ba 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
+++ b/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
@@ -3,12 +3,13 @@ THEME_NAME=GreenLaguna
 themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0
 
 theme_DATA = \
-	gtk.css \
-	gtk-main.css \
+    gtk.css \
+    gtk-main.css \
     gtk-main-common.css \
     gtk-widgets.css \
     gtk-widgets-assets.css \
-	settings.ini
+    mate-applications.css \
+    settings.ini
 
 EXTRA_DIST = $(theme_DATA)
 
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 55364428..c502a7ee 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
@@ -78,18 +78,20 @@ 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:active,
 .primary-toolbar .button:active,
 .primary-toolbar .toolbar .button:active,
 .primary-toolbar.toolbar .button:active,
 .toolbar GtkComboBox .button,
 .primary-toolbar .toolbar GtkComboBox .button,
-.primary-toolbar.toolbar GtkComboBox .button/*,
 .toolbar .button:active:hover,
 .primary-toolbar .toolbar .button:active:hover,
 .primary-toolbar.toolbar .button:active:hover,
-.primary-toolbar .toolbar GtkComboBox .button:hover,
-.primary-toolbar.toolbar GtkComboBox .button:hover*/ {
+.primary-toolbar .toolbar GtkComboBox .button:hover {
 	border-image: url("assets/toolbar-button-border.svg") 3 / 3px stretch;
 }
 
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index b62bbfa5..784e0302 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -461,6 +461,28 @@ GtkCalendar {
 	padding: 2px;
 }
 
+.frame.flat {
+	border-style: none;
+}
+
+.frame.action-bar {
+	padding: 6px;
+	border-width: 1px 0 0;
+}
+
+GtkScrolledWindow.frame {
+	border-style: solid;
+	border-color: @borders;
+	border-width: 1px;
+	border-radius: 2px;
+	padding: 0;
+}
+
+/* no double frames */
+GtkScrolledWindow GtkViewport.frame {
+	border-style: none;
+}
+
 /***************
  * GtkLevelBar *
  ***************/
@@ -870,7 +892,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 GtkImage,
@@ -1162,9 +1207,14 @@ GtkTreeMenu .menuitem * {
     -GtkMenuBar-internal-padding: 0;
 }
 
+.menubar .menuitem {
+    transition: all 300ms ease-out;
+    padding: 3px 7px;
+}
+
 .menubar .menuitem,
 .menu .menuitem {
-    transition: all 200ms ease-out;
+    transition: all 300ms ease-out;
     border-width: 0px;
     border-style: none;
     padding: 3px 4px;
@@ -1350,17 +1400,6 @@ GtkTreeMenu .menuitem * {
 	-adwaita-focus-border-radius: 2;
 }
 
-.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:active,
 .primary-toolbar .button:active,
 .primary-toolbar .toolbar .button:active,
@@ -1369,14 +1408,15 @@ GtkTreeMenu .menuitem * {
 .primary-toolbar .toolbar GtkComboBox .button,
 .primary-toolbar.toolbar GtkComboBox .button {
 	border-radius: 3px;
-
-	background-image: linear-gradient(to bottom,
-	                                  @button_gradient_color_a,
-	                                  @button_gradient_color_b);
+	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:active:hover,
 .primary-toolbar .button:active:hover,
 .primary-toolbar .toolbar .button:active:hover,
@@ -2091,7 +2131,9 @@ GtkLabel {
 }
 
 /* ie. pluma open dialog */
-.sidebar GtkTreeView row:hover {
+.sidebar GtkTreeView row:hover,
+.sidebar GtkTreeView row:active:hover,
+.sidebar GtkTreeView row:selected:hover {
 	background-image:  linear-gradient(to bottom,
 	                                  @theme_bg_color,
 	                                  shade(@theme_bg_color, 0.80));
@@ -2293,9 +2335,9 @@ GsmFailWhaleDialog * {
  * Nautilus *
  ************/
 
-NautilusView .view,
-NemoView .view {
-	background-color: shade(@base_color, 1.02);
+NemoView .view,
+NautilusView .view {
+	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
new file mode 100644
index 00000000..a50c71ef
--- /dev/null
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -0,0 +1,513 @@
+/************
+ * Caja *
+ ************/
+
+/*background of icon view */
+CajaView .entry {
+    background-color: shade(@base_color, 1.06)
+}
+
+/*background of list view */
+CajaWindow .view {
+    background-color: shade(@base_color, 1.06)
+}
+
+/* FIXME, doesn't work */
+.caja-inactive-pane .view {
+	background-color: shade(@theme_bg_color, 0.9);
+}
+
+.caja-inactive-pane .notebook {
+	background-color: shade(@theme_bg_color, 0.9);
+}
+
+.caja-inactive-pane .notebook tab.top:active {
+	background-image: linear-gradient(to bottom,
+	                                  shade(@theme_bg_color, 0.8),
+	                                  shade(@theme_bg_color, 0.86) 40%,
+	                                  shade(@theme_bg_color, 0.88) 70%,
+	                                  shade(@theme_bg_color, 0.9));
+}
+
+.caja-inactive-pane .notebook .scrollbar.button:insensitive {
+	background-color: shade(@theme_bg_color, 0.9);
+	border-radius: 0px;
+}
+
+/* file renaming */
+CajaView .view .entry,
+CajaView .view .entry:focus {
+	background-image: none;
+	border-image: none;
+	border-style: solid;
+	border-radius: 1px;
+	border-color: @theme_selected_bg_color;
+}
+
+/*CajaToolbar .toolbar {
+	border-radius: 0px;
+}*/
+
+/* the small line between sidebar and view */
+CajaWindow * {
+    -GtkPaned-handle-size: 2px;
+}
+
+CajaWindow GtkScrolledWindow.frame {
+	border-style: none;
+}
+
+CajaView .expander column:sorted:selected,
+CajaView .expander column:sorted:selected:hover {
+	background-image: none;
+	background-color: transparent;
+}
+
+CajaWindow .floating-bar {
+	font: italic;
+}
+
+CajaWindow .notebook {
+	/*border-color: shade(@notebook_border, 1.2);*/
+	border-radius: 0px 0px 5px 5px;
+}
+
+CajaWindow .notebook tab {
+	border-radius: 0px;
+}
+
+CajaWindow .notebook tab:active {
+	border-radius: 0px 0px 5px 5px;
+}
+
+CajaWindow .notebook tab.top {
+	/* top right-left bottom */
+	padding: 4px 8px 4px;
+}
+
+CajaWindow .notebook tab.top:active {
+	padding: 6px 8px 4px;
+}
+
+CajaWindow .notebook .view.rubberband,
+CajaWindow .notebook .rubberband {
+	background-color: alpha(@theme_selected_bg_color, 0.35);
+	border-radius: 6px;
+}
+
+/* Caja places bar */
+CajaWindow .button.flat {
+    border-style: solid;
+    border-color: shade(@button_border, 1.1);
+    border-radius: 3px;
+    padding: 2px 5px;
+}
+
+CajaWindow .button.flat:hover {
+    border-radius: 3px;
+    padding: 2px 5px;
+}
+
+/* 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 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,
+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,
+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,
+CajaWindow CajaHistorySidebar .cell.image:selected,
+CajaWindow CajaHistorySidebar .cell.image:selected:focus {
+    color: shade(@theme_selected_bg_color, 0.75);
+}
+
+
+CajaWindow .question,  /* why question for trash? */
+CajaWindow .info,
+CajaTrashBar.info,
+CajaXContentBar.info,
+CajaQueryEditor.info,
+CajaSearchBar.info {
+	background-color: @theme_bg_color;
+}
+
+CajaSearchBar.info {
+	border-radius: 0px;
+}
+
+CajaWindow NautilusQueryEditor .toolbar,
+CajaWindow .notebook NautilusQueryEditor .toolbar {
+	background-image: none;
+	background-color: transparent;
+	padding: 5px 7px;
+}
+
+.caja-canvas-item {
+	border-radius: 5px;
+}
+
+.caja-desktop.nautilus-canvas-item {
+	color: @theme_bg_color;
+	text-shadow: 1px 1px black;
+}
+
+.caja-desktop.nautilus-canvas-item:active {
+	color: @theme_text_color;
+}
+
+.caja-desktop.nautilus-canvas-item:selected {
+	color: @theme_selected_fg_color;
+}
+
+.caja-desktop.nautilus-canvas-item:active,
+.caja-desktop.nautilus-canvas-item:prelight,
+.caja-desktop.nautilus-canvas-item:selected {
+	text-shadow: none;
+}
+
+/****************
+ * Mate-Panel *
+ ****************/
+
+/* the panel bar itself */
+.mate-panel-menu-bar,
+MatePanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelFrame,
+PanelAppletFrame,
+MatePanelAppletFrameDBus,
+MatePanelAppletContainer,
+MatePanelApplet {
+	background-image: none;
+	background-color: @theme_bg_color;
+	padding: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+/* needed for a working top panel with 24px (default) */
+PanelMenuBar.menubar * {
+	background-image: none;
+	background-color: transparent;
+	border-width: 0px;
+	border-style: none;
+	padding: 0px;
+	text-shadow: none;
+}
+
+PanelMenuBar.menubar .menuitem {
+    transition: all 300ms ease-out;
+}
+
+/* set selected menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+	background-image: none;
+	background-color: shade(@theme_selected_bg_color, 1.1);
+	border-style: none;
+	border-image: none;
+	/* join menuitem to menu */
+	border-radius: 3px 3px 0px 0px;
+	border-width: 0px;
+	text-shadow: none;
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+	background-image:  linear-gradient(to bottom,
+	                                  shade(@theme_selected_bg_color, 1.6),
+	                                  shade(@theme_selected_bg_color, 0.6));
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-image: url("assets/menu-border.svg") 2 / 2px stretch;
+}
+
+MatePanelApplet {
+	border-width: 0;
+}
+
+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;
+}
+
+/* desktop-applet, clockapplet, drivemount, character-map,
+dictionary */
+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:active:hover,
+MatePanelApplet .button:active {
+    border-radius: 3px;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
+	                                  @button_gradient_color_b,
+	                                  @button_gradient_color_a);
+}
+
+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 {
+    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:active:hover,
+WnckTasklist .button:active {
+    border-radius: 3px;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_b,
+                                      @button_gradient_color_a);
+}
+
+WnckTasklist .button:hover {
+    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 {
+    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 */
+.mate-panel-window-menu-menu-bar .menu .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
+	background-image:  linear-gradient(to bottom,
+	                                  shade(@theme_selected_bg_color, 1.6),
+	                                  shade(@theme_selected_bg_color, 0.6));
+	color: @theme_text_color;
+	border-style: solid;
+	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);*/
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+MatePanelApplet > GtkMenuBar.menubar {
+	font: normal;
+}
+
+WnckPager {
+	background-image: none;
+	border-color: transparent;
+	background-color: shade(@theme_bg_color, 0.9);
+	text-shadow: none;
+}
+
+/* prelight of WnckPager */
+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;
+}
+
+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;
+}
+
+/****************
+ * Mate-Terminal *
+ ****************/
+
+/* Background mate-terminal, this isn't the normal way to style that! */
+TerminalWindow .entry {
+    -TerminalWindow-background-darkness: 0.95;
+    background-color: @selected_fg_color;
+    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;
+}