summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-04-18 10:34:03 +0200
committerraveit65 <[email protected]>2015-04-18 10:34:03 +0200
commitcc8e634eeef8bbcfe82dd93449708a7956fdb9bb (patch)
tree699e0882a13ad52a4c659427bad2190053afce14
parent5b69c196f6279e3f8ff34191f763329e0fbfee70 (diff)
downloadmate-themes-cc8e634eeef8bbcfe82dd93449708a7956fdb9bb.tar.bz2
mate-themes-cc8e634eeef8bbcfe82dd93449708a7956fdb9bb.tar.xz
BlackMATE GTK3: use builtin icons for csd window controls
-rw-r--r--configure.ac1
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/Makefile.am6
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/gtk-main.css1
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css44
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls.css159
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile.am17
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/button-close-focus.pngbin0 -> 848 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.pngbin0 -> 841 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.pngbin0 -> 841 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.pngbin0 -> 870 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.pngbin0 -> 868 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.pngbin0 -> 786 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.pngbin0 -> 870 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.pngbin0 -> 870 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.pngbin0 -> 786 bytes
-rw-r--r--desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.pngbin0 -> 868 bytes
16 files changed, 219 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 4d61446c..0569de7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ desktop-themes/BlackMATE/gtk-2.0/assets/Makefile
desktop-themes/BlackMATE/gtk-2.0/Styles/Makefile
desktop-themes/BlackMATE/gtk-3.0/Makefile
desktop-themes/BlackMATE/gtk-3.0/assets/Makefile
+desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile
desktop-themes/BlackMATE/metacity-1/Makefile
desktop-themes/BlackMATE/cinnamon/Makefile
desktop-themes/BlackMATE/unity/Makefile
diff --git a/desktop-themes/BlackMATE/gtk-3.0/Makefile.am b/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
index 1c4d3636..c3daad42 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
+++ b/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
@@ -11,8 +11,10 @@ theme_DATA = \
gtk-widgets-assets-dark.css \
mate-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/BlackMATE/gtk-3.0/gtk-main.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
index 873c12e5..10482fdb 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
@@ -164,3 +164,4 @@
@import url("gtk-widgets-assets-dark.css");
@import url("unity.css");
@import url("mate-applications.css");
+@import url("window-controls.css");
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 54637b24..946ac79b 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -40,8 +40,8 @@
outline-style: dashed;
outline-offset: 2px;
outline-width: 0px; /* disable ugly focus-line */
- -gtk-icon-style: regular; /* no symbolic icons */
- text-shadow: none;
+ /*-gtk-icon-style: regular; *//* no symbolic icons */
+ text-shadow: none;
}
/***************
@@ -154,6 +154,18 @@
border-radius: 2px;
}
+GtkExpander {
+ -gtk-icon-style: regular;
+}
+
+/***********
+ * Sidebar *
+ ***********/
+.sidebar,
+GtkPlacesSidebar.sidebar .view {
+ -gtk-icon-style: regular;
+}
+
/****************
* Floating Bar *
****************/
@@ -546,11 +558,11 @@ GtkCalendar {
}
/* disable for GTK3-3.16 , issue with caja list-view frame*/
-/*
+
GtkScrolledWindow.frame {
- background-color: transparent;
+/* background-color: transparent; */
+ -gtk-icon-style: regular;
}
-*/
/* no double frames */
GtkScrolledWindow GtkViewport.frame {
@@ -1185,6 +1197,7 @@ GtkComboBox .menu {
* Buttons *
***********/
.button {
+ -gtk-icon-style: regular;
-GtkWidget-focus-line-width: 0;
/* Due to a bug somewhere in gtk or cairo,
a padding of zero (or even one) doesn't work always!!! */
@@ -2350,7 +2363,7 @@ GtkPopover .separator {
background-image: none;
background-color: #747473;
}
-
+
.titlebar .titlebutton,
.header-bar.frame.titlebar .button.image-button.titlebutton,
.button.text-button.titlebutton {
@@ -2368,6 +2381,18 @@ GtkPopover .separator {
@button_hover_gradient_color_a,
@button_hover_gradient_color_b);
}
+
+.titlebar .titlebutton {
+ /* fake request for hardcoded icons,
+ to avoid usage of regular window-close button*/
+ -gtk-icon-style: requested;
+/* transition: none; */
+ 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,
@@ -2383,7 +2408,12 @@ GtkPopover .separator {
color-stop (0.43, @theme_bg_color),
to (shade(@button_gradient_color_b, 0.7)));
}
-
+
+.titlebar .titlebutton:hover {
+ background-image: none;
+ background-color: transparent;
+}
+
.titlebar .titlebutton:active,
.titlebar .titlebutton:active:hover,
.header-bar.frame.titlebar:active,
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
new file mode 100644
index 00000000..bc97295e
--- /dev/null
+++ b/desktop-themes/BlackMATE/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/BlackMATE/gtk-3.0/window-controls/Makefile.am b/desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile.am
new file mode 100644
index 00000000..80a64070
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile.am
@@ -0,0 +1,17 @@
+THEME_NAME=BlackMATE
+
+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/BlackMATE/gtk-3.0/window-controls/button-close-focus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-close-focus.png
new file mode 100644
index 00000000..fda5ca77
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-close-focus.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.png
new file mode 100644
index 00000000..1a1dad93
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.png
new file mode 100644
index 00000000..1a1dad93
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.png
new file mode 100644
index 00000000..0173bb1f
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.png
new file mode 100644
index 00000000..5c1f3495
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.png
new file mode 100644
index 00000000..da98bd1e
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.png
new file mode 100644
index 00000000..0173bb1f
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.png
new file mode 100644
index 00000000..0173bb1f
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.png
new file mode 100644
index 00000000..f2757481
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.png
Binary files differ
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.png
new file mode 100644
index 00000000..5c1f3495
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.png
Binary files differ