diff options
Diffstat (limited to 'desktop-themes/Green-Submarine')
15 files changed, 30 insertions, 14 deletions
diff --git a/desktop-themes/Green-Submarine/Makefile.am b/desktop-themes/Green-Submarine/Makefile.am index 0cb9e35f..ab8e44ce 100644 --- a/desktop-themes/Green-Submarine/Makefile.am +++ b/desktop-themes/Green-Submarine/Makefile.am @@ -1,19 +1,22 @@ -THEME_NAME=Green-Submarine -THEME_IN_FILES=index.theme.in +THEME_NAME = Green-Submarine themedir = $(datadir)/themes/$(THEME_NAME) +theme_in_files = index.theme.in +theme_DATA = $(theme_in_files:.theme.in=.theme) -theme_DATA = index.theme - -$(theme_DATA): $(THEME_IN_FILES) +%.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 = \ cinnamon \ - emerald \ + emerald \ gtk-2.0 \ gtk-3.0 \ metacity-1 -DISTCLEANFILES = index.theme -EXTRA_DIST = index.theme.in +CLEANFILES = index.theme +EXTRA_DIST = $(theme_in_files) diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/handle.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/handle.png Binary files differindex 51978aed..51978aed 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/handle.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/handle.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-bottom.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-bottom.png Binary files differindex 70fffda8..70fffda8 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-bottom.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-bottom.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-left.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-left.png Binary files differindex 747c57b1..747c57b1 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-left.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-left.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-right.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-right.png Binary files differindex 04fd5dc4..04fd5dc4 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-right.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-right.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-top.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-top.png Binary files differindex 138f1cd9..138f1cd9 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-top.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook-gap-top.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook.png Binary files differindex e8f03f69..e8f03f69 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/notebook.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/null.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/null.png Binary files differindex a7627448..a7627448 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/null.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/null.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/scroll-background.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/scroll-background.png Binary files differindex dbe3655a..dbe3655a 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/scroll-background.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/scroll-background.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-horizontal.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-horizontal.png Binary files differindex 5ecd836d..5ecd836d 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-horizontal.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-horizontal.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-vertical.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-vertical.png Binary files differindex d9c06362..d9c06362 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-vertical.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/slider-vertical.png diff --git a/desktop-themes/Green-Submarine/gtk-2.0/assets/toolbar.png b/desktop-themes/Green-Submarine/gtk-2.0/assets/toolbar.png Binary files differindex 364f8962..364f8962 100755..100644 --- a/desktop-themes/Green-Submarine/gtk-2.0/assets/toolbar.png +++ b/desktop-themes/Green-Submarine/gtk-2.0/assets/toolbar.png diff --git a/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am b/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am index be09ee05..bbc62fc7 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am +++ b/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am @@ -12,8 +12,18 @@ theme_DATA = \ settings.ini \ sidebar.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 -DIST_SUBDIRS = assets +CLEAN = \ + settings.ini + +SUBDIRS = \ + assets + +DIST_SUBDIRS = \ + assets diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css index b548c915..e9c8d45c 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -5965,6 +5965,7 @@ headerbar, @wm_bg_a, @wm_bg_b); box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95); + color: @theme_fg_dark_color; } headerbar, @@ -6291,6 +6292,7 @@ headerbar paned > separator { background: none; background-color: transparent; padding: 5px 5px 6px 5px; + margin: 0px -3px 0px -3px; border-width: 1px; border-radius: 5px; border-color: transparent; @@ -6517,7 +6519,8 @@ headerbar paned > separator { box-shadow: none; } -.background.csd decoration { +.background.csd decoration, +window.unified { border-color: darker(@theme_bg_dark_color); border-radius: 7px 7px 0 0; border-width: 1px; diff --git a/desktop-themes/Green-Submarine/gtk-3.0/settings.ini b/desktop-themes/Green-Submarine/gtk-3.0/settings.ini.in index 3f33c4d8..8931ed7a 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/settings.ini +++ b/desktop-themes/Green-Submarine/gtk-3.0/settings.ini.in @@ -1,4 +1,4 @@ [Settings] -gtk-color-scheme = "base_color:#FFF\nbg_color:#CBD9D4\ntooltip_bg_color:#DBFFF3\nselected_bg_color:#72B49D\ntext_color:#1A1A1A\nfg_color:#101010;\ntooltip_fg_color:#000000\nselected_fg_color:#ffffff\nlink_color:#00CC85\nbg_color_dark:#1F2724\nfg_color_dark:#E6E6E6" gtk-auto-mnemonics = 1 - +gtk-color-scheme = "base_color:#FFF\nbg_color:#CBD9D4\ntooltip_bg_color:#DBFFF3\nselected_bg_color:#72B49D\ntext_color:#1A1A1A\nfg_color:#101010;\ntooltip_fg_color:#000000\nselected_fg_color:#ffffff\nlink_color:#00CC85\nbg_color_dark:#1F2724\nfg_color_dark:#E6E6E6" +gtk-print-preview-command = @bindir@/atril-previewer --unlink-tempfile --print-settings %s %f |