4 files changed, 26 insertions, 15 deletions
diff --git a/desktop-themes/GreenLaguna/Makefile.am b/desktop-themes/GreenLaguna/Makefile.am
index 049fbad8..7cefed57 100644
--- a/desktop-themes/GreenLaguna/Makefile.am
+++ b/desktop-themes/GreenLaguna/Makefile.am
@@ -1,21 +1,21 @@
-THEME_NAME=GreenLaguna
-THEME_IN_FILES=index.theme.in
+THEME_NAME = GreenLaguna
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
- COPYING \
- index.theme \
- README
+theme_DATA = COPYING index.theme README
 
 %.theme: %.theme.in
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS = \
 gtk-2.0 \
 gtk-3.0 \
- metacity-1 \
+ metacity-1 \
 unity
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am b/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
index 05f3b104..9771999d 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
+++ b/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am
@@ -14,8 +14,17 @@ theme_DATA = \
 unity.css \
 window-controls.css
 
-EXTRA_DIST = $(theme_DATA)
+%.ini: %.ini.in
+ $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@
 
-SUBDIRS = assets \
+EXTRA_DIST = \
+ $(theme_DATA) \
+ settings.ini.in
+
+CLEAN = \
+ settings.ini
+
+SUBDIRS = \
+ assets \
 window-controls
 
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 322bbd2e..6dd5e3ed 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -3481,7 +3481,7 @@ paned.horizontal.titlebar separator,
 .titlebar button.toggle.popup.titlebutton,
 headerbar.frame.titlebar button.image-button.titlebutton,
 button.text-button.titlebutton {
- padding: 2px;
+ padding: 3px;
 margin: 0px 1px;
 }
 
@@ -3506,7 +3506,8 @@ button.titlebutton.maximize {
 box-shadow: none;
 }
 
-.background.csd decoration {
+.background.csd decoration,
+window.unified {
 border-radius: 7px 7px 0px 0px;
 border-width: 0px;
 box-shadow: 0 0 0 2px @wm_csd_border_color, 0 2px 8px 3px @wm_shadow;
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/settings.ini b/desktop-themes/GreenLaguna/gtk-3.0/settings.ini.in
index 7fe52fbb..77cbd8e1 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/settings.ini
+++ b/desktop-themes/GreenLaguna/gtk-3.0/settings.ini.in
@@ -1,4 +1,5 @@
 [Settings]
-gtk-color-scheme = "base_color:#E6EFE3\nbg_color:#E6EFE3\ntooltip_bg_color:#333433\nselected_bg_color:#6F816A\ntext_color:#000000\nfg_color:#101010;\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff"
 gtk-auto-mnemonics = 1
+gtk-color-scheme = "base_color:#E6EFE3\nbg_color:#E6EFE3\ntooltip_bg_color:#333433\nselected_bg_color:#6F816A\ntext_color:#000000\nfg_color:#101010;\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff"
+gtk-print-preview-command = @bindir@/atril-previewer --unlink-tempfile --print-settings %s %f
 gtk-visible-focus = automatic