summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-04-16 16:04:25 +0200
committerraveit65 <[email protected]>2015-04-16 16:05:34 +0200
commit33cd0381c07f9cb9a28eeb7d9f97f0e851ce5706 (patch)
treeeefc7bf7b5d15a362c195ac958c11e3ef64a4a5f
parentfc6475fae48ab00b0d64b2cdbe4538fb9d5d854e (diff)
downloadmate-themes-33cd0381c07f9cb9a28eeb7d9f97f0e851ce5706.tar.bz2
mate-themes-33cd0381c07f9cb9a28eeb7d9f97f0e851ce5706.tar.xz
Menta themes GTK3: use normal window control icons for csd applications
-rw-r--r--configure.ac2
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/Makefile.am6
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/gtk-main.css1
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css11
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css17
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls.css159
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/Makefile.am22
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_normal.pngbin0 -> 971 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_prelight.pngbin0 -> 994 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_pressed.pngbin0 -> 943 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused.pngbin0 -> 591 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused_prelight.pngbin0 -> 606 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_normal.pngbin0 -> 918 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_prelight.pngbin0 -> 926 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_pressed.pngbin0 -> 884 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused.pngbin0 -> 611 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused_prelight.pngbin0 -> 603 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/menu.pngbin0 -> 314 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/menu_prelight.pngbin0 -> 272 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_normal.pngbin0 -> 899 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_prelight.pngbin0 -> 903 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_pressed.pngbin0 -> 883 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused.pngbin0 -> 602 bytes
-rw-r--r--desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused_prelight.pngbin0 -> 593 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/Makefile.am7
-rw-r--r--desktop-themes/Menta/gtk-3.0/gtk-main.css1
-rw-r--r--desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css11
-rw-r--r--desktop-themes/Menta/gtk-3.0/gtk-widgets.css17
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls.css159
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/Makefile.am22
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/close_focused_normal.pngbin0 -> 971 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/close_focused_prelight.pngbin0 -> 994 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/close_focused_pressed.pngbin0 -> 943 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused.pngbin0 -> 591 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused_prelight.pngbin0 -> 606 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_normal.pngbin0 -> 918 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_prelight.pngbin0 -> 926 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_pressed.pngbin0 -> 884 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused.pngbin0 -> 611 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused_prelight.pngbin0 -> 603 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/menu.pngbin0 -> 314 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/menu_prelight.pngbin0 -> 272 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_normal.pngbin0 -> 899 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_prelight.pngbin0 -> 903 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_pressed.pngbin0 -> 883 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused.pngbin0 -> 602 bytes
-rw-r--r--desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused_prelight.pngbin0 -> 593 bytes
47 files changed, 398 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac
index 9a773819..4d61446c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile
desktop-themes/Menta/gtk-3.0/Makefile
desktop-themes/Menta/gtk-3.0/assets/Makefile
desktop-themes/Menta/gtk-3.0/borders/Makefile
+desktop-themes/Menta/gtk-3.0/window-controls/Makefile
desktop-themes/Menta/metacity-1/Makefile
desktop-themes/Menta/unity/Makefile
desktop-themes/Menta/xfwm4/Makefile
@@ -109,6 +110,7 @@ desktop-themes/BlueMenta/gtk-2.0/widgets/Scale/Makefile
desktop-themes/BlueMenta/gtk-3.0/Makefile
desktop-themes/BlueMenta/gtk-3.0/assets/Makefile
desktop-themes/BlueMenta/gtk-3.0/borders/Makefile
+desktop-themes/BlueMenta/gtk-3.0/window-controls/Makefile
desktop-themes/BlueMenta/metacity-1/Makefile
desktop-themes/BlueMenta/unity/Makefile
desktop-themes/BlueMenta/xfwm4/Makefile
diff --git a/desktop-themes/BlueMenta/gtk-3.0/Makefile.am b/desktop-themes/BlueMenta/gtk-3.0/Makefile.am
index 03dced05..5d058cb9 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/Makefile.am
+++ b/desktop-themes/BlueMenta/gtk-3.0/Makefile.am
@@ -13,10 +13,12 @@ theme_DATA = \
mate-applications.css \
other-applications.css \
settings.ini \
- unity.css
+ unity.css \
+ window-controls.css
EXTRA_DIST = $(theme_DATA)
SUBDIRS = \
assets \
- borders
+ borders \
+ window-controls
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
index 5cde80cc..e79d5c8a 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
@@ -226,3 +226,4 @@
@import url("mate-applications.css");
@import url("other-applications.css");
@import url("unity.css");
+@import url("window-controls.css");
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
index e94ceda5..3177d75f 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -81,17 +81,6 @@ GtkComboBox.combobox-entry .button:focus,
border-color: transparent;
}
-/* generic button borders */
-.titlebar .titlebutton,
-.titlebar .titlebutton:hover,
-.titlebar .titlebutton:active {
- border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
- border-radius: 4px;
- border-width: 2px;
- border-style: solid;
- border-color: transparent;
-}
-
.titlebar .button:hover,
.titlebar .button:checked:checked,
.titlebar .titlebutton:hover,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 47ce1cab..f57cd967 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -33,7 +33,7 @@
outline-offset: -3px; /* 2px */
outline-width: 0px; /* disable ugly focus-line */
outline-radius: 2px;
- -gtk-icon-style: regular; /* disable symbolic icons */
+/* -gtk-icon-style: regular;*/ /* disable symbolic icons */
}
/***************
@@ -867,6 +867,7 @@ GtkLevelBar.vertical {
}
GtkScrolledWindow.frame {
+ -gtk-icon-style: regular;
border-style: solid;
border-color: @borders;
border-width: 1px;
@@ -887,6 +888,7 @@ GtkScrolledWindow GtkViewport.frame {
.button.menuitem.menubar,
GtkColorButton.button,
GtkComboBox.combobox-entry .button {
+ -gtk-icon-style: regular;
padding: 4px;
}
@@ -2760,6 +2762,7 @@ GtkMessageDialog {
***********/
.sidebar,
.sidebar .view {
+ -gtk-icon-style: regular;
background-color: @sidebar_bg;
}
@@ -3878,6 +3881,7 @@ GtkTreeView.view.expander:checked {
}
GtkExpander {
+ -gtk-icon-style: regular;
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
}
GtkExpander:dir(rtl) {
@@ -4346,10 +4350,13 @@ GtkModelButton.button.flat:selected {
border-image: none;*/
}
-/* borders are in gtk-widget-assets */
-.titlebar .titlebutton:hover {
-/* border: none;
- border-image: none;*/
+.titlebar .titlebutton {
+ /* fake request for hardcoded icons,
+ to avoid usage of regular window-close button*/
+ -gtk-icon-style: requested;
+ color: @wm_title;
+ padding: 4px;
+ border-image: none;
}
.titlebar .titlebutton:active {
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls.css b/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
new file mode 100644
index 00000000..7ec98563
--- /dev/null
+++ b/desktop-themes/BlueMenta/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/minimize_focused_normal.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/minimize_focused_prelight.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/minimize_focused_pressed.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/minimize_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/maximize_focused_normal.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/maximize_focused_prelight.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/maximize_focused_pressed.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/maximize_unfocused.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/close_focused_normal.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/close_focused_prelight.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/close_focused_pressed.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/close_unfocused.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/menu.png');
+}
+
+.titlebar .button.menu-button.titlebutton:hover {
+ background-image: url('window-controls/menu_prelight.png');
+}
+
+.titlebar .button.menu-button.titlebutton:active {
+ background-image: url('window-controls/menu.png');
+}
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/Makefile.am b/desktop-themes/BlueMenta/gtk-3.0/window-controls/Makefile.am
new file mode 100644
index 00000000..0f7e8d1b
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/Makefile.am
@@ -0,0 +1,22 @@
+themedir = $(datadir)/themes/BlueMenta/gtk-3.0/window-controls
+
+theme_DATA = \
+ close_focused_normal.png \
+ close_focused_prelight.png \
+ close_focused_pressed.png \
+ close_unfocused.png \
+ close_unfocused_prelight.png \
+ maximize_focused_normal.png \
+ maximize_focused_prelight.png \
+ maximize_focused_pressed.png \
+ maximize_unfocused.png \
+ maximize_unfocused_prelight.png \
+ menu.png \
+ menu_prelight.png \
+ minimize_focused_normal.png \
+ minimize_focused_prelight.png \
+ minimize_focused_pressed.png \
+ minimize_unfocused.png \
+ minimize_unfocused_prelight.png
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_normal.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_normal.png
new file mode 100644
index 00000000..1e756072
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_normal.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_prelight.png
new file mode 100644
index 00000000..1f3a813f
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_prelight.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_pressed.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_pressed.png
new file mode 100644
index 00000000..53173dc1
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_focused_pressed.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused.png
new file mode 100644
index 00000000..8f35ba3d
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused_prelight.png
new file mode 100644
index 00000000..e6afbd63
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/close_unfocused_prelight.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_normal.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_normal.png
new file mode 100644
index 00000000..604db70a
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_normal.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_prelight.png
new file mode 100644
index 00000000..25b8f06b
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_prelight.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_pressed.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_pressed.png
new file mode 100644
index 00000000..892efce1
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_focused_pressed.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused.png
new file mode 100644
index 00000000..c734f5ea
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused_prelight.png
new file mode 100644
index 00000000..598af3f0
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/maximize_unfocused_prelight.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/menu.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/menu.png
new file mode 100644
index 00000000..b35c0828
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/menu.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/menu_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/menu_prelight.png
new file mode 100644
index 00000000..0713ddc7
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/menu_prelight.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_normal.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_normal.png
new file mode 100644
index 00000000..dd8834d0
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_normal.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_prelight.png
new file mode 100644
index 00000000..c8b10e71
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_prelight.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_pressed.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_pressed.png
new file mode 100644
index 00000000..a5581579
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_focused_pressed.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused.png
new file mode 100644
index 00000000..701996c7
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused.png
Binary files differ
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused_prelight.png
new file mode 100644
index 00000000..2f93af0a
--- /dev/null
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls/minimize_unfocused_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/Makefile.am b/desktop-themes/Menta/gtk-3.0/Makefile.am
index 37e0fc55..35bce905 100644
--- a/desktop-themes/Menta/gtk-3.0/Makefile.am
+++ b/desktop-themes/Menta/gtk-3.0/Makefile.am
@@ -1,4 +1,3 @@
-
themedir = $(datadir)/themes/Menta/gtk-3.0
theme_DATA = \
@@ -14,10 +13,12 @@ theme_DATA = \
gtk-widgets-borders.css \
other-applications.css \
settings.ini \
- unity.css
+ unity.css \
+ window-controls.css
EXTRA_DIST = $(theme_DATA)
SUBDIRS = \
assets \
- borders
+ borders \
+ window-controls
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main.css b/desktop-themes/Menta/gtk-3.0/gtk-main.css
index 567fa79b..1a00f46a 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main.css
@@ -225,3 +225,4 @@
@import url("mate-applications.css");
@import url("other-applications.css");
@import url("unity.css");
+@import url("window-controls.css");
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
index e94ceda5..3177d75f 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -81,17 +81,6 @@ GtkComboBox.combobox-entry .button:focus,
border-color: transparent;
}
-/* generic button borders */
-.titlebar .titlebutton,
-.titlebar .titlebutton:hover,
-.titlebar .titlebutton:active {
- border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
- border-radius: 4px;
- border-width: 2px;
- border-style: solid;
- border-color: transparent;
-}
-
.titlebar .button:hover,
.titlebar .button:checked:checked,
.titlebar .titlebutton:hover,
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index c1c1911e..d913466d 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -33,7 +33,7 @@
outline-offset: -3px; /* 2px */
outline-width: 0px; /* disable ugly focus-line */
outline-radius: 2px;
- -gtk-icon-style: regular; /* disable symbolic icons */
+/* -gtk-icon-style: regular;*/ /* disable symbolic icons */
}
/***************
@@ -867,6 +867,7 @@ GtkLevelBar.vertical {
}
GtkScrolledWindow.frame {
+ -gtk-icon-style: regular;
border-style: solid;
border-color: @borders;
border-width: 1px;
@@ -887,6 +888,7 @@ GtkScrolledWindow GtkViewport.frame {
.button.menuitem.menubar,
GtkColorButton.button,
GtkComboBox.combobox-entry .button {
+ -gtk-icon-style: regular;
padding: 4px;
}
@@ -2764,6 +2766,7 @@ GtkMessageDialog {
***********/
.sidebar,
.sidebar .view {
+ -gtk-icon-style: regular;
background-color: @sidebar_bg;
}
@@ -3889,6 +3892,7 @@ GtkTreeView.view.expander:checked {
}
GtkExpander {
+ -gtk-icon-style: regular;
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
}
GtkExpander:dir(rtl) {
@@ -4357,10 +4361,13 @@ GtkModelButton.button.flat:selected {
border-image: none;*/
}
-/* borders are in gtk-widget-assets */
-.titlebar .titlebutton:hover {
-/* border: none;
- border-image: none;*/
+.titlebar .titlebutton {
+ /* fake request for hardcoded icons,
+ to avoid usage of regular window-close button*/
+ -gtk-icon-style: requested;
+ color: @wm_title;
+ padding: 4px;
+ border-image: none;
}
.titlebar .titlebutton:active {
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls.css b/desktop-themes/Menta/gtk-3.0/window-controls.css
new file mode 100644
index 00000000..7ec98563
--- /dev/null
+++ b/desktop-themes/Menta/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/minimize_focused_normal.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/minimize_focused_prelight.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/minimize_focused_pressed.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/minimize_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/maximize_focused_normal.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/maximize_focused_prelight.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/maximize_focused_pressed.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/maximize_unfocused.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/close_focused_normal.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/close_focused_prelight.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/close_focused_pressed.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/close_unfocused.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/menu.png');
+}
+
+.titlebar .button.menu-button.titlebutton:hover {
+ background-image: url('window-controls/menu_prelight.png');
+}
+
+.titlebar .button.menu-button.titlebutton:active {
+ background-image: url('window-controls/menu.png');
+}
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/Makefile.am b/desktop-themes/Menta/gtk-3.0/window-controls/Makefile.am
new file mode 100644
index 00000000..32b34aee
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/Makefile.am
@@ -0,0 +1,22 @@
+themedir = $(datadir)/themes/Menta/gtk-3.0/window-controls
+
+theme_DATA = \
+ close_focused_normal.png \
+ close_focused_prelight.png \
+ close_focused_pressed.png \
+ close_unfocused.png \
+ close_unfocused_prelight.png \
+ maximize_focused_normal.png \
+ maximize_focused_prelight.png \
+ maximize_focused_pressed.png \
+ maximize_unfocused.png \
+ maximize_unfocused_prelight.png \
+ menu.png \
+ menu_prelight.png \
+ minimize_focused_normal.png \
+ minimize_focused_prelight.png \
+ minimize_focused_pressed.png \
+ minimize_unfocused.png \
+ minimize_unfocused_prelight.png
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_normal.png b/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_normal.png
new file mode 100644
index 00000000..1e756072
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_normal.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_prelight.png
new file mode 100644
index 00000000..1f3a813f
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_pressed.png b/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_pressed.png
new file mode 100644
index 00000000..53173dc1
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/close_focused_pressed.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused.png b/desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused.png
new file mode 100644
index 00000000..8f35ba3d
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused_prelight.png
new file mode 100644
index 00000000..e6afbd63
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/close_unfocused_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_normal.png b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_normal.png
new file mode 100644
index 00000000..604db70a
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_normal.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_prelight.png
new file mode 100644
index 00000000..25b8f06b
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_pressed.png b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_pressed.png
new file mode 100644
index 00000000..892efce1
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_focused_pressed.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused.png b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused.png
new file mode 100644
index 00000000..c734f5ea
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused_prelight.png
new file mode 100644
index 00000000..598af3f0
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/maximize_unfocused_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/menu.png b/desktop-themes/Menta/gtk-3.0/window-controls/menu.png
new file mode 100644
index 00000000..b35c0828
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/menu.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/menu_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/menu_prelight.png
new file mode 100644
index 00000000..0713ddc7
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/menu_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_normal.png b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_normal.png
new file mode 100644
index 00000000..dd8834d0
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_normal.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_prelight.png
new file mode 100644
index 00000000..c8b10e71
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_prelight.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_pressed.png b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_pressed.png
new file mode 100644
index 00000000..a5581579
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_focused_pressed.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused.png b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused.png
new file mode 100644
index 00000000..701996c7
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused.png
Binary files differ
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused_prelight.png
new file mode 100644
index 00000000..2f93af0a
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/window-controls/minimize_unfocused_prelight.png
Binary files differ