diff options
16 files changed, 216 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 0569de7c..15761ec1 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ desktop-themes/GreenLaguna/gtk-2.0/Makefile desktop-themes/GreenLaguna/gtk-2.0/Styles/Makefile desktop-themes/GreenLaguna/gtk-3.0/Makefile desktop-themes/GreenLaguna/gtk-3.0/assets/Makefile +desktop-themes/GreenLaguna/gtk-3.0/window-controls/Makefile desktop-themes/GreenLaguna/metacity-1/Makefile desktop-themes/GreenLaguna/unity/Makefile desktop-themes/Menta/Makefile diff --git a/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am b/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am index 7da3b579..04e94060 100644 --- a/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am +++ b/desktop-themes/GreenLaguna/gtk-3.0/Makefile.am @@ -11,9 +11,11 @@ theme_DATA = \ mate-applications.css \ other-applications.css \ settings.ini \ - unity.css + unity.css \ + window-controls.css EXTRA_DIST = $(theme_DATA) -SUBDIRS = assets +SUBDIRS = assets \ + window-controls 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 59d826dc..c7b84a25 100644 --- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css @@ -106,7 +106,6 @@ GtkScale.scale-has-marks-above.slider.vertical:insensitive { .primary-toolbar.toolbar .button:hover, .primary-toolbar .toolbar GtkComboBox .button:hover, .primary-toolbar.toolbar GtkComboBox .button:hover, -.titlebar .titlebutton:hover, .header-bar.frame.titlebar .button.image-button.titlebutton:hover, .button.text-button.titlebutton:hover, .toolbar .button:active:hover, @@ -119,7 +118,6 @@ GtkScale.scale-has-marks-above.slider.vertical:insensitive { .primary-toolbar .button:hover:first-child, .primary-toolbar .toolbar .button:hover:first-child, .primary-toolbar.toolbar .button:hover:first-child, -.titlebar .titlebutton:hover:first-child, .header-bar.frame.titlebar .button.image-button.titlebutton:hover:first-child, .button.text-button.titlebutton:hover:first-child, .toolbar .button:active:hover:first-child, @@ -132,7 +130,6 @@ GtkScale.scale-has-marks-above.slider.vertical:insensitive { .primary-toolbar .button:hover:last-child, .primary-toolbar .toolbar .button:hover:last-child, .primary-toolbar.toolbar .button:hover:last-child, -.titlebar .titlebutton:hover:last-child, .header-bar.frame.titlebar .button.image-button.titlebutton:hover:last-child, .button.text-button.titlebutton:hover:last-child, .toolbar .button:active:hover:last-child, diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css index 31e6f490..e2a62d22 100644 --- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css @@ -36,7 +36,7 @@ outline-style: dashed; outline-offset: 2px; outline-width: 0px; /* disable ugly focus-line */ - -gtk-icon-style: regular; /* no symbolic icons */ + /*-gtk-icon-style: regular; *//* no symbolic icons */ } /*************** @@ -153,6 +153,10 @@ border-radius: 2px; } +GtkExpander { + -gtk-icon-style: regular; +} + /************************ * overshoot/undershoot * ************************/ @@ -703,6 +707,7 @@ GtkCalendar { } GtkScrolledWindow.frame { + -gtk-icon-style: regular; border-style: solid; border-color: @borders; border-width: 1px; @@ -1135,6 +1140,7 @@ GtkTreeMenu .menuitem * { * Buttons * ***********/ .button { + -gtk-icon-style: regular; /* Due to a bug somewhere in gtk or cairo, a padding of zero (or even one) doesn't work always! */ padding: 2px; @@ -2364,12 +2370,10 @@ GtkPopover .separator { /* Due to a bug somewhere in gtk or cairo, a padding of zero (or even one) doesn't work always!!! */ padding: 4px 4px 4px 4px; - border-radius: 3px; border-width: 1px; border-style: solid; text-shadow: 0 -1px black; - color: #CCD9D0; background-image: -gtk-gradient (radial, 0.5 -2.0, 2.0, @@ -2377,7 +2381,18 @@ GtkPopover .separator { from (shade(@button_gradient_color_a, 1.5)), to (shade(@button_gradient_color_b, 1.1))); } - + +.titlebar .titlebutton { + /* fake request for hardcoded icons, + to avoid usage of regular window-close button*/ + -gtk-icon-style: requested; + border-width: 0px; + border-style: none; + border-image-source: none; + background-image: none; + padding: 4px 0px 4px 0px; +} + .titlebar .titlebutton:hover, .header-bar.frame.titlebar .button.image-button.titlebutton:hover, .button.text-button.titlebutton:hover { @@ -2388,7 +2403,21 @@ GtkPopover .separator { @button_hover_gradient_color_a, @button_hover_gradient_color_b); } - + +.titlebar .titlebutton:hover { + border-width: 0px; + border-style: none; + border-image-source: none; + border-color: transparent; + background-image: none; + background-color: transparent; +} + +/* avoid double displaying of window controls */ +.titlebar .button GtkImage { + color: transparent; +} + .titlebar .titlebutton:active, .titlebar .titlebutton:active:hover, .header-bar.frame.titlebar:active, diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css b/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css new file mode 100644 index 00000000..bc97295e --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css @@ -0,0 +1,159 @@ +.titlebar .right .titlebutton:nth-last-child(3), +.titlebar .right:dir(rtl) .titlebutton:nth-child(3), +.titlebar .left .titlebutton:nth-child(3), +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3), +.titlebar .right .titlebutton:nth-last-child(2), +.titlebar .right:dir(rtl) .titlebutton:nth-child(2), +.titlebar .left .titlebutton:nth-child(2), +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2), +.titlebar .right .titlebutton:last-child, +.titlebar .right:dir(rtl) .titlebutton:first-child, +.titlebar .left .titlebutton:first-child, +.titlebar .left:dir(rtl) .titlebutton:last-child { + color: transparent; + background-position: center; + background-repeat: no-repeat; + background-size: 19px 19px; +} + +/* Set correct layout with + gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for + buttons on the right or + gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}" + for buttons on the left */ + +/* minimize */ + +.titlebar .right .titlebutton:nth-last-child(3), +.titlebar .right:dir(rtl) .titlebutton:nth-child(3), +.titlebar .left .titlebutton:nth-child(3), +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) { + background-image: url('window-controls/neutral.png'); +} + +.titlebar .right .titlebutton:nth-last-child(3):hover, +.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover, +.titlebar .left .titlebutton:nth-child(3):hover, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover { + background-image: url('window-controls/button-min-focus.png'); +} + +.titlebar .right .titlebutton:nth-last-child(3):active, +.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active, +.titlebar .left .titlebutton:nth-child(3):active, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active, +.titlebar .right .titlebutton:nth-last-child(3):checked, +.titlebar .right:dir(rtl) .titlebutton:nth-child(3):checked, +.titlebar .left .titlebutton:nth-child(3):checked, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):checked { + background-image: url('window-controls/neutral.png'); +} + +.titlebar .right .titlebutton:nth-last-child(3):backdrop, +.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop, +.titlebar .left .titlebutton:nth-child(3):backdrop, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop { + background-image: url('window-controls/unfocused.png'); +} +/* +.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover, +.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover, +.titlebar .left .titlebutton:nth-child(3):backdrop:hover, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover { + background-image: url('window-controls/minimize_unfocused_prelight.png'); +} +*/ +/* maximize */ +.titlebar .right .titlebutton:nth-last-child(2), +.titlebar .right:dir(rtl) .titlebutton:nth-child(2), +.titlebar .left .titlebutton:nth-child(2), +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) { + background-image: url('window-controls/neutral.png'); +} + +.titlebar .right .titlebutton:nth-last-child(2):hover, +.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover, +.titlebar .left .titlebutton:nth-child(2):hover, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover { + background-image: url('window-controls/button-max-focus.png'); +} + +.titlebar .right .titlebutton:nth-last-child(2):active, +.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active, +.titlebar .left .titlebutton:nth-child(2):active, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active, +.titlebar .right .titlebutton:nth-last-child(2):checked, +.titlebar .right:dir(rtl) .titlebutton:nth-child(2):checked, +.titlebar .left .titlebutton:nth-child(2):checked, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):checked { + background-image: url('window-controls/neutral.png'); +} + +.titlebar .right .titlebutton:nth-last-child(2):backdrop, +.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop, +.titlebar .left .titlebutton:nth-child(2):backdrop, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop { + background-image: url('window-controls/unfocus.png'); +} +/* +.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover, +.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover, +.titlebar .left .titlebutton:nth-child(2):backdrop:hover, +.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover { + background-image: url('window-controls/maximize_unfocused_prelight.png'); +} +*/ +/* close */ +.titlebar .right .titlebutton:last-child, +.titlebar .right:dir(rtl) .titlebutton:first-child, +.titlebar .left .titlebutton:first-child, +.titlebar .left:dir(rtl) .titlebutton:last-child { + background-image: url('window-controls/neutral.png'); + /*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */ +} + +.titlebar .right .titlebutton:last-child:hover, +.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +.titlebar .left .titlebutton:first-child:hover, +.titlebar .left:dir(rtl) .titlebutton:last-child:hover { + background-image: url('window-controls/button-close-focus.png'); +} + +.titlebar .right .titlebutton:last-child:active, +.titlebar .right:dir(rtl) .titlebutton:first-child:active, +.titlebar .left .titlebutton:first-child:active, +.titlebar .left:dir(rtl) .titlebutton:last-child:active, +.titlebar .right .titlebutton:last-child:checked, +.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +.titlebar .left .titlebutton:first-child:checked, +.titlebar .left:dir(rtl) .titlebutton:last-child:checked { + background-image: url('window-controls/neutral.png'); +} + +.titlebar .right .titlebutton:last-child:backdrop, +.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +.titlebar .left .titlebutton:first-child:backdrop, +.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop { + background-image: url('window-controls/unfocus.png'); +} +/* +.titlebar .right .titlebutton:last-child:backdrop:hover, +.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +.titlebar .left .titlebutton:first-child:backdrop:hover, +.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover { + background-image: url('window-controls/close_unfocused_prelight.png'); +} +*/ +/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */ + +.titlebar .button.menu-button.titlebutton { + background-image: url('window-controls/neutral.png'); +} + +.titlebar .button.menu-button.titlebutton:hover { + background-image: url('window-controls/yellow.png'); +} + +.titlebar .button.menu-button.titlebutton:active { + background-image: url('window-controls/menu-button-pressed.png'); +} diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/Makefile.am b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/Makefile.am new file mode 100644 index 00000000..0d3aa937 --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/Makefile.am @@ -0,0 +1,18 @@ +THEME_NAME=GreenLaguna + +themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/window-controls + +theme_DATA = \ + button-close-focus.png + button-max-focus1.png + button-max-focus.png + button-min-focus.png + menu-button-pressed.png + neutral.png + unabove-button.png + unabove-button-unfocus.png + unfocus.png + yellow.png + +EXTRA_DIST = $(theme_DATA) + diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-close-focus.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-close-focus.png Binary files differnew file mode 100644 index 00000000..3297f854 --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-close-focus.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-max-focus.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-max-focus.png Binary files differnew file mode 100644 index 00000000..6b93868c --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-max-focus.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-max-focus1.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-max-focus1.png Binary files differnew file mode 100644 index 00000000..6b93868c --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-max-focus1.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-min-focus.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-min-focus.png Binary files differnew file mode 100644 index 00000000..b44cde4c --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/button-min-focus.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/menu-button-pressed.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/menu-button-pressed.png Binary files differnew file mode 100644 index 00000000..b15b508a --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/menu-button-pressed.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/neutral.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/neutral.png Binary files differnew file mode 100644 index 00000000..8b224eca --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/neutral.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unabove-button-unfocus.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unabove-button-unfocus.png Binary files differnew file mode 100644 index 00000000..b44cde4c --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unabove-button-unfocus.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unabove-button.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unabove-button.png Binary files differnew file mode 100644 index 00000000..b44cde4c --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unabove-button.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unfocus.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unfocus.png Binary files differnew file mode 100644 index 00000000..247739d7 --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/unfocus.png diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls/yellow.png b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/yellow.png Binary files differnew file mode 100644 index 00000000..b15b508a --- /dev/null +++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls/yellow.png |
