diff --git a/README b/README
index e4dae5ada30ebe3bf6100cba517c358140dbc587..45b94d0cfe7a8f3495c08b3752cbdfbde8c9ddd7 100644
--- a/README
+++ b/README
@@ -1,14 +1,15 @@
Name: Greenbird
Summary: Desktop Suite for Xfce.
-URL: http://git.manjaro.org/artwork/greenbird-theme
+URL: http://shimmerproject.org/projects/greybird/
-Copyright 2013 - 2014 Manjaro (based on Greybird by Simon Steinbeiß and Satyajit Sahoo)
-Greybird is dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later.
+Copyright 2013-2015 Manjaro Artwork Team
+Copyright 2009–2012 Simon Steinbeiß and Satyajit Sahoo
+Greenbird is dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later.
Desktop Suite for Xfce.
-Greybird is the default theme in Xubuntu 11.04 onwards.
+Greenbird is the default theme in Manjaro XFCE.
-The Greybird desktop suite includes:
+The Greenbird desktop suite includes:
– GTK2 theme
– GTK3 theme
– Xfwm4 themes (normal and compact)
diff --git a/gtk-2.0/apps/xfce-panel.rc b/gtk-2.0/apps/xfce-panel.rc
index c799a0088a7116f54c4e99bff856dfda73ad0497..f226c67ceb76ddffce0750b3bdec52cd73ba780d 100644
--- a/gtk-2.0/apps/xfce-panel.rc
+++ b/gtk-2.0/apps/xfce-panel.rc
@@ -127,6 +127,7 @@ widget "*WnckPager*" style "workspace-switcher"
class "GtkEntry" style "combo"
class "*SexyIconEntry*" style:highest "combo" # fixes dict-plugin
widget "*xfce4-verve-plugin*GtkEntry" style:highest "combo" # fixes verve-plugin
+widget "*bookmark*GtkEntry" style "panel-entry" # fixes smartbookmark-plugin
# Make sure panel text color doesn't change
widget_class "*Panel*MenuBar*" style "theme-main-menu-text"
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 10161f766d8eb0068a9637972273f007905fe31c..9e6d59a5661a4dda469058a062792e166eb021e6 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,7 +1,6 @@
# Author: Philip Müller <philm@manjaro.org>
-# Author of original greybird theme: Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
# Theme: Greenbird
-# based on "Bluebird" by Simon Steinbeiß and Pasi Lallinaho
+# based on "Bluebird" and "Greybird" by Simon Steinbeiß, Satyajit Sahoo and Pasi Lallinaho
# Description: As is the original theme, this theme is 100% free and open source.
gtk-color-scheme = "bg_color:#CECECE\nselected_bg_color:#9bc264\nbase_color:#fcfcfc" # Background, base.
@@ -433,8 +432,7 @@ style "scrollbar"
bg[NORMAL] = @bg_color
- bg[ACTIVE] = shade (0.98, @bg_color)
- #bg[ACTIVE] = shade (1.75, @base_color)
+ bg[ACTIVE] = shade (1.75, @base_color)
bg[PRELIGHT] = shade (0.8, @bg_color)
bg[INSENSITIVE] = shade (0.75, @bg_color)
@@ -443,8 +441,7 @@ style "scrollbar"
colorize_scrollbar = FALSE
roundness = 10
border_shades = {0.75, 0.75}
- trough_shades = {0.98,0.98}
- #trough_shades = {1.1, 1.3}
+ trough_shades = {1.1, 1.3}
contrast = 0.05
gradient_shades = {1.06,1.06,1.04,1.04}
}
@@ -596,19 +593,40 @@ style "xfce-header"
style "xfwm-tabwin"
{
Xfwm4TabwinWidget::border-width = 1
+ Xfwm4TabwinWidget::border-alpha = 0.9
Xfwm4TabwinWidget::icon-size = 64
+ Xfwm4TabwinWidget::listview-icon-size = 16
+ Xfwm4TabwinWidget::alpha = 0.8
+ Xfwm4TabwinWidget::border-radius = 10
bg[NORMAL] = shade (0.35, @bg_color_dark)
- bg[SELECTED] = shade (0.65, @bg_color_dark)
- fg[NORMAL] = shade (1.5, @bg_color)
- base[SELECTED] = shade (1.5, @bg_color)
-
- engine "murrine"
- {
- focusstyle = 0
+ bg[ACTIVE] = shade (0.65, @selected_bg_color)
+ bg[PRELIGHT] = shade (0.85, @selected_bg_color)
+ bg[SELECTED] = shade (0.45, @bg_color_dark)
+
+ fg[NORMAL] = shade (0.8, @base_color)
+ fg[ACTIVE] = @base_color
+ fg[PRELIGHT] = @base_color
+
+ engine "murrine" {
+ roundness = 6
+ contrast = 0.8
+ highlight_shade = 1.00
+ lightborder_shade = 1.0
+ gradient_shades = {0.9,1.2,1.2,1.4}
+ border_shades = { 3.5, 3.5 }
+ reliefstyle = 0
+ shadow_shades = { 1.3, 1.7 }
+ textstyle = 1
+ text_shade = 0.25
}
}
+style "xfwm-tabwin-button"
+{
+ font_name = "bold"
+}
+
style "xfdesktop-icon-view"
{
XfdesktopIconView::label-alpha = 0
@@ -762,6 +780,7 @@ widget_class "*GnmSimpleCanvas*" style "treeview-header" # Gnumeric treeview-he
# Xfce specific theming
widget_class "*XfceHeading*" style "xfce-header"
widget "xfwm4-tabwin*" style "xfwm-tabwin"
+widget "xfwm4-tabwin*GtkButton*" style "xfwm-tabwin-button"
widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
widget_class "*XfsmLogoutDialog*GtkVBox.GtkVBox.GtkLabel" style "xfsm-label"
widget_class "*XfsmLogoutDialog*GtkButton*" style "xfsm-button"
diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css
index d0743da7627a8a0df9d0ef33bf19716ee909a1a3..1cc063d79c47a9058d2336ba2709d30018639cbf 100644
--- a/gtk-3.0/apps/gnome-applications.css
+++ b/gtk-3.0/apps/gnome-applications.css
@@ -104,10 +104,6 @@ WnckPager, WnckTasklist {
/************
* nautilus *
************/
-.nautilus-canvas-item {
- border-radius: 3px;
-}
-
.nautilus-desktop.nautilus-canvas-item {
color: white;
text-shadow: 1px 1px black;
diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css
index df8a7770abe7364352a228f06cb03ab1d6d77062..b21c119b19b19f97f61b856641be17772a91cd02 100644
--- a/gtk-3.0/apps/granite-widgets.css
+++ b/gtk-3.0/apps/granite-widgets.css
@@ -60,7 +60,7 @@
}
.dynamic-notebook .menu GtkLabel {
- color: @menu_fg;
+ color: @menu_fg_color;
}
/****************
diff --git a/gtk-3.0/apps/lightdm-gtk-greeter.css b/gtk-3.0/apps/lightdm-gtk-greeter.css
index f5fb55bbae33859987884cb385d0518ae5616148..7b86c2f671d098b9e767bc95f9a094159080d9f4 100644
--- a/gtk-3.0/apps/lightdm-gtk-greeter.css
+++ b/gtk-3.0/apps/lightdm-gtk-greeter.css
@@ -1,6 +1,15 @@
+/***********
+ * general *
+ ***********/
+
+#screen.lightdm-gtk-greeter {
+ background: transparent;
+}
+
/*********
* panel *
*********/
+
#panel_window {
background-color: alpha (black, 0.5);
color: white;
@@ -175,6 +184,7 @@
/******************************
* default and focused button *
******************************/
+#login_window #login_button,
#login_window .button.default,
#shutdown_dialog .button.default,
#restart_dialog .button.default,
diff --git a/gtk-3.0/apps/lightdm-unity-greeter.css b/gtk-3.0/apps/lightdm-unity-greeter.css
index c8454042ed4f96e8b1b546e85fe0d6275e4447a6..c0dd6f8ae48117101e52d33e3c21fd73304b6a2d 100644
--- a/gtk-3.0/apps/lightdm-unity-greeter.css
+++ b/gtk-3.0/apps/lightdm-unity-greeter.css
@@ -56,3 +56,12 @@
border-color: alpha(white, 0.9);
color: white;
}
+
+@keyframes dashentry_spinner {
+ to { -gtk-icon-transform: rotate(1turn); }
+}
+
+.lightdm.entry:active {
+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+ animation: dashentry_spinner 1s infinite linear;
+}
diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css
index 5bd318966f582e745a2be919860eae84cda9a6a2..1e69dc4ed2c02edc47e648f05ac16d5e7cc8e72e 100644
--- a/gtk-3.0/apps/unity.css
+++ b/gtk-3.0/apps/unity.css
@@ -86,3 +86,13 @@ UnityPanelWidget,
color: @panel_fg_color;
}
+
+@keyframes playbackmenuitem_spinner {
+ to { -gtk-icon-transform: rotate(1turn); }
+}
+
+.menu IdoPlaybackMenuItem.menuitem:active {
+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+ animation: playbackmenuitem_spinner 1s infinite linear;
+ color: @theme_fg_color;
+}
diff --git a/gtk-3.0/apps/xfce.css b/gtk-3.0/apps/xfce.css
index 3415217bf847db5a33b3c05a8f2faa497612e767..bb0b5ff4cc67d24f31b700666047399fa402ac1c 100644
--- a/gtk-3.0/apps/xfce.css
+++ b/gtk-3.0/apps/xfce.css
@@ -2,6 +2,34 @@ CatfishWindow .pane-separator {
background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
}
+CatfishWindow .sidebar .button.flat {
+ padding: 4px 6px;
+ border-radius: 4px;
+ transition: none;
+}
+
+CatfishWindow .sidebar .button.flat:active,
+CatfishWindow .sidebar .button.flat:checked {
+ border-width: 1px;
+ border-style: solid;
+ border-top-color: shade(@theme_bg_color, 0.85);
+ border-right-color: shade(@theme_bg_color, 0.95);
+ border-bottom-color: shade(@theme_bg_color, 1.12);
+ border-left-color: shade(@theme_bg_color, 0.95);
+ background-image: linear-gradient(to bottom,
+ shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.87),
+ shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.95) 10%,
+ shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.99) 92%,
+ shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.92)
+ );
+}
+
+CatfishWindow .sidebar .button.flat:hover {
+ background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3);
+ background-image: none;
+ color: @theme_text_color;
+}
+
XfceHeading,
.XfceHeading {
margin: 0;
@@ -20,13 +48,18 @@ XfceHeading,
}
.xfce4-panel .button {
+ background-image: none;
+ background-color: transparent;
border-radius: 0;
+ border-color: transparent;
+ box-shadow: none;
padding: 0 1px;
color: @panel_fg_color;
text-shadow: 0px 1px alpha(@dark_shadow, 1.0);
}
-.xfce4-panel .button:active {
+.xfce4-panel .button:active,
+.xfce4-panel .button:checked {
background-image: none;
background-color: shade(@panel_bg_color, 0.7);
border-color: shade(@panel_bg_color, 0.6);
@@ -35,7 +68,8 @@ XfceHeading,
}
.xfce4-panel .button:hover,
-.xfce4-panel .button:active:hover {
+.xfce4-panel .button:active:hover,
+.xfce4-panel .button:checked:hover {
border-color: shade(@selected_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(@selected_bg_color, 0.88),
diff --git a/gtk-3.0/assets/checkbox-checked-hover.png b/gtk-3.0/assets/checkbox-checked-hover.png
index 3e778be3fd934b7796173a7425089fbbe8ef50b5..a6af0f7c12124f41ea601f3e26753b4bfd6866db 100644
Binary files a/gtk-3.0/assets/checkbox-checked-hover.png and b/gtk-3.0/assets/checkbox-checked-hover.png differ
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png
index 0d56055ec49d8a81f2d0cc071cb62163e3b6b7ea..f29b8016f09660b8bd63e9cbc314f0603c3fc826 100644
Binary files a/gtk-3.0/assets/checkbox-checked-insensitive.png and b/gtk-3.0/assets/checkbox-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-checked.png b/gtk-3.0/assets/checkbox-checked.png
index b977681d87085c1da6752e01a9c6f22f2b00db5c..2f21288b6a1c37beb11a81b411f408f56730e5ba 100644
Binary files a/gtk-3.0/assets/checkbox-checked.png and b/gtk-3.0/assets/checkbox-checked.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-hover.png b/gtk-3.0/assets/checkbox-mixed-hover.png
index 054a3aab241e1ad0e022a8007766b4eefeda10ad..35ceac10ade013f90df9b7096af73fad510745c7 100644
Binary files a/gtk-3.0/assets/checkbox-mixed-hover.png and b/gtk-3.0/assets/checkbox-mixed-hover.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png
index 435fc94f844107f99e1b049b8aef2db9f0bb76b9..118d253fb3073652c43d3c1e5510939635c53d38 100644
Binary files a/gtk-3.0/assets/checkbox-mixed-insensitive.png and b/gtk-3.0/assets/checkbox-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed.png b/gtk-3.0/assets/checkbox-mixed.png
index 7bce21c3672c3228bcbf3547dad37ef4092bfb3c..7b266a19a4d2dd575c4ccfaa6273aa80b11cab08 100644
Binary files a/gtk-3.0/assets/checkbox-mixed.png and b/gtk-3.0/assets/checkbox-mixed.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.png b/gtk-3.0/assets/checkbox-unchecked-insensitive.png
index d320a1cf20552424789eebd9dfb28e076a00c0aa..ad60a9949e724a4cc2197776140bafe25482ed24 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked-insensitive.png and b/gtk-3.0/assets/checkbox-unchecked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked.png b/gtk-3.0/assets/checkbox-unchecked.png
index 2a84efc1b55adb7783356476de4df0396afdcff8..283ae530cb7bb7b374b61529be11b995acc72ea1 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked.png and b/gtk-3.0/assets/checkbox-unchecked.png differ
diff --git a/gtk-3.0/assets/radio-mixed-hover.png b/gtk-3.0/assets/radio-mixed-hover.png
index 65cb8b5cd5239791d3d78f44c68797742ec9dc06..1dc344a0efe47ba11e65fa4a83d49f8c6f4f33f9 100644
Binary files a/gtk-3.0/assets/radio-mixed-hover.png and b/gtk-3.0/assets/radio-mixed-hover.png differ
diff --git a/gtk-3.0/assets/radio-mixed-insensitive.png b/gtk-3.0/assets/radio-mixed-insensitive.png
index 404bb494d8df0cf640948f6110b854f3ae41b954..152e911cf0033547375d57ca0579664fb80c0b32 100644
Binary files a/gtk-3.0/assets/radio-mixed-insensitive.png and b/gtk-3.0/assets/radio-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png
index 0c54fc80b9633b421656f0a02449b3f99cc4dc11..c0db5e79b59384ab17121eaaf23d12801ee3db69 100644
Binary files a/gtk-3.0/assets/radio-mixed.png and b/gtk-3.0/assets/radio-mixed.png differ
diff --git a/gtk-3.0/assets/radio-selected-hover.png b/gtk-3.0/assets/radio-selected-hover.png
index c4ccd3069f4208886eaa30bd1182d69b4ea1ad06..01dba20d3f2be41d37d230c98776df599237161a 100644
Binary files a/gtk-3.0/assets/radio-selected-hover.png and b/gtk-3.0/assets/radio-selected-hover.png differ
diff --git a/gtk-3.0/assets/radio-selected-insensitive.png b/gtk-3.0/assets/radio-selected-insensitive.png
index d82e373d263d6753bcb32756888ae975a3e55158..c544b2d7106867569d30f7ae8eb2b90b592ba674 100644
Binary files a/gtk-3.0/assets/radio-selected-insensitive.png and b/gtk-3.0/assets/radio-selected-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-selected.png b/gtk-3.0/assets/radio-selected.png
index 13d5925b628e7ebc4c72ef63f1a90b4781d63c36..80f218f82ad93a5b37074403592145ce3eecb6ff 100644
Binary files a/gtk-3.0/assets/radio-selected.png and b/gtk-3.0/assets/radio-selected.png differ
diff --git a/gtk-3.0/assets/radio-unselected-insensitive.png b/gtk-3.0/assets/radio-unselected-insensitive.png
index 7225090f4898e2239c29ba84634f2b73ea3fced8..f8bb219f1d595bbf37e8e19b5cd7580afc311d5c 100644
Binary files a/gtk-3.0/assets/radio-unselected-insensitive.png and b/gtk-3.0/assets/radio-unselected-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-unselected.png b/gtk-3.0/assets/radio-unselected.png
index e18c7e5913fa146cdbd1bce86c45548689a68e09..9667f92ba45b4c21e408e1b702c01ee691d0761d 100644
Binary files a/gtk-3.0/assets/radio-unselected.png and b/gtk-3.0/assets/radio-unselected.png differ
diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css
index 48d30121db5e645d1e8997ad8eea0825f07ce5cd..6adf167812e6748bd4981bbc46d159b397f30f05 100644
--- a/gtk-3.0/gtk-widgets-assets.css
+++ b/gtk-3.0/gtk-widgets-assets.css
@@ -2,147 +2,137 @@
* check and radio *
*******************/
/* draw regular check and radio items using our assets */
-.check,
-.check row:selected,
-.check row:selected:focus {
- background-image: url("assets/checkbox-unchecked.png");
+.check {
+ -gtk-icon-source: url("assets/checkbox-unchecked.png");
}
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
- background-image: url("assets/checkbox-unchecked-insensitive.png");
+.check:insensitive {
+ -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png");
}
.check:active,
-.check row:selected:active,
-.check row:selected:focus:active {
- background-image: url("assets/checkbox-checked.png");
+.check:checked {
+ -gtk-icon-source: url("assets/checkbox-checked.png");
}
.check:active:hover,
-.check row:selected:active:hover,
-.check row:selected:focus:active:hover {
- background-image: url("assets/checkbox-checked-hover.png");
+.check:checked:hover {
+ -gtk-icon-source: url("assets/checkbox-checked-hover.png");
}
.check:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
- background-image: url("assets/checkbox-checked-insensitive.png");
+.check:checked:insensitive {
+ -gtk-icon-source: url("assets/checkbox-checked-insensitive.png");
}
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
- background-image: url("assets/checkbox-mixed.png");
+.check:inconsistent {
+ -gtk-icon-source: url("assets/checkbox-mixed.png");
}
-.check:inconsistent:hover,
-.check row:selected:inconsistent:hover,
-.check row:selected:focus:inconsistent:hover {
- background-image: url("assets/checkbox-mixed-hover.png");
+.check:inconsistent:hover {
+ -gtk-icon-source: url("assets/checkbox-mixed-hover.png");
}
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
- background-image: url("assets/checkbox-mixed-insensitive.png");
+.check:inconsistent:insensitive {
+ -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png");
}
-.radio,
-.radio row:selected,
-.radio row:selected:focus {
- background-image: url("assets/radio-unselected.png");
+.radio {
+ -gtk-icon-source: url("assets/radio-unselected.png");
}
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
- background-image: url("assets/radio-unselected-insensitive.png");
+.radio:insensitive {
+ -gtk-icon-source: url("assets/radio-unselected-insensitive.png");
}
.radio:active,
-.radio row:selected:active,
-.radio row:selected:focus:active {
- background-image: url("assets/radio-selected.png");
+.radio:checked {
+ -gtk-icon-source: url("assets/radio-selected.png");
}
.radio:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
- background-image: url("assets/radio-selected-hover.png");
+.radio:checked:hover {
+ -gtk-icon-source: url("assets/radio-selected-hover.png");
}
.radio:active:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
- background-image: url("assets/radio-selected-insensitive.png");
+.radio:checked:insensitive {
+ -gtk-icon-source: url("assets/radio-selected-insensitive.png");
}
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
- background-image: url("assets/radio-mixed.png");
+.radio:inconsistent {
+ -gtk-icon-source: url("assets/radio-mixed.png");
}
-.radio:inconsistent:hover,
-.radio row:selected:inconsistent:hover,
-.radio row:selected:focus:inconsistent:hover {
- background-image: url("assets/radio-mixed-hover.png");
+.radio:inconsistent:hover {
+ -gtk-icon-source: url("assets/radio-mixed-hover.png");
}
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
- background-image: url("assets/radio-mixed-insensitive.png");
+.radio:inconsistent:insensitive {
+ -gtk-icon-source: url("assets/radio-mixed-insensitive.png");
}
-.menuitem.check:active {
- background-image: url("assets/menuitem-checkbox-checked.png");
+.menuitem.check,
+.menuitem.check:insensitive {
+ -gtk-icon-source: none;
}
-.menuitem.check:active:hover {
- background-image: url("assets/menuitem-checkbox-checked-hover.png");
+.menuitem.check:active,
+.menuitem.check:checked {
+ -gtk-icon-source: url("assets/menuitem-checkbox-checked.png");
}
-.menuitem.check:active:insensitive {
- background-image: url("assets/menuitem-checkbox-checked-insensitive.png");
+.menuitem.check:active:hover,
+.menuitem.check:checked:hover {
+ -gtk-icon-source: url("assets/menuitem-checkbox-checked-hover.png");
+}
+
+.menuitem.check:active:insensitive,
+.menuitem.check:checked:insensitive {
+ -gtk-icon-source: url("assets/menuitem-checkbox-checked-insensitive.png");
}
.menuitem.check:inconsistent:hover,
.menuitem.radio:inconsistent:hover {
- background-image: url("assets/menuitem-checkbox-mixed-hover.png");
+ -gtk-icon-source: url("assets/menuitem-checkbox-mixed-hover.png");
}
.menuitem.check:inconsistent,
.menuitem.radio:inconsistent {
- background-image: url("assets/menuitem-checkbox-mixed.png");
+ -gtk-icon-source: url("assets/menuitem-checkbox-mixed.png");
}
.menuitem.check:inconsistent:insensitive,
.menuitem.radio:inconsistent:insensitive {
- background-image: url("assets/menuitem-checkbox-mixed-insensitive.png");
+ -gtk-icon-source: url("assets/menuitem-checkbox-mixed-insensitive.png");
+}
+
+.menuitem.radio,
+.menuitem.radio:insensitive {
+ -gtk-icon-source: none;
}
-.menuitem.radio:active {
- background-image: url("assets/menuitem-radio-checked.png");
+.menuitem.radio:active,
+.menuitem.radio:checked {
+ -gtk-icon-source: url("assets/menuitem-radio-checked.png");
}
-.menuitem.radio:active:hover {
- background-image: url("assets/menuitem-radio-checked-hover.png");
+.menuitem.radio:active:hover,
+.menuitem.radio:checked:hover {
+ -gtk-icon-source: url("assets/menuitem-radio-checked-hover.png");
}
-.menuitem.radio:active:insensitive {
- background-image: url("assets/menuitem-radio-checked-insensitive.png");
+.menuitem.radio:active:insensitive,
+.menuitem.radio:checked:insensitive {
+ -gtk-icon-source: url("assets/menuitem-radio-checked-insensitive.png");
}
GtkIconView.content-view.cell.check {
- background-image: url("assets/grid-selection-unchecked.png");
+ -gtk-icon-source: url("assets/grid-selection-unchecked.png");
}
-GtkIconView.content-view.cell.check:active {
- background-image: url("assets/grid-selection-checked.png");
+GtkIconView.content-view.cell.check:active, GtkIconView.content-view.cell.check:checked {
+ -gtk-icon-source: url("assets/grid-selection-checked.png");
}
/***************
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 17227013c9b9aa7157495cc394df197225ec244f..24413c5695969a28170c2645415529eab15ff4c5 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -122,7 +122,7 @@ GtkGrid:insensitive {
******************/
/* transitions */
.button {
- transition: background 150ms ease-in-out;
+ transition: none;
}
.entry {
@@ -133,6 +133,14 @@ GtkGrid:insensitive {
transition: all 150ms ease-in;
}
+.notebook tab GtkLabel,
+.notebook .prelight-page,
+.notebook .prelight-page GtkLabel,
+.notebook .active-page,
+.notebook .active-page GtkLabel {
+ transition: all 200ms ease-in;
+}
+
/* inset shadows */
.button,
.primary-toolbar .raised .button,
@@ -152,7 +160,11 @@ GtkSwitch.slider {
.button:active,
.primary-toolbar .button:active,
.toolbar .button:active,
-.header-bar .button:active {
+.header-bar .button:active,
+.button:checked,
+.primary-toolbar .button:checked,
+.toolbar .button:checked,
+.header-bar .button:checked {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
}
@@ -175,6 +187,7 @@ GtkSwitch.slider:insensitive {
.primary-toolbar GtkComboBox,
.primary-toolbar .button *,
.primary-toolbar .button,
+.notebook tab .button,
column-header .button,
GtkCalendar.button {
box-shadow: none;
@@ -231,7 +244,8 @@ GtkAssistant .sidebar {
);
}
-.button:active {
+.button:active,
+.button:checked {
border-color: shade(@theme_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 0.85), 1.05),
@@ -239,7 +253,8 @@ GtkAssistant .sidebar {
);
}
-.button:active:hover {
+.button:active:hover,
+.button:checked:hover {
border-top-color: shade(@theme_bg_color, 0.85);
border-right-color: shade(@theme_bg_color, 0.78);
border-left-color: shade(@theme_bg_color, 0.78);
@@ -253,7 +268,9 @@ GtkAssistant .sidebar {
.button:focus,
.button:hover:focus,
.button:active:focus,
-.button:active:hover:focus {
+.button:active:hover:focus,
+.button:checked:focus,
+.button:checked:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
@@ -265,7 +282,8 @@ GtkAssistant .sidebar {
);
}
-.button:active *:insensitive {
+.button:active:insensitive,
+.button:checked:insensitive {
border-color: shade(@theme_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 0.95), 1.05),
@@ -290,7 +308,8 @@ GtkAssistant .sidebar {
);
}
-.button.default:active {
+.button.default:active,
+.button.default:checked {
border-color: shade(@theme_selected_bg_color, 0.7);
background-image: linear-gradient(to bottom,
shade(alpha(@theme_selected_bg_color, 0.7), 1.05),
@@ -298,7 +317,8 @@ GtkAssistant .sidebar {
);
}
-.button.default:active:hover {
+.button.default:active:hover,
+.button.default:checked:hover {
border-color: shade(@theme_selected_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05),
@@ -306,6 +326,14 @@ GtkAssistant .sidebar {
);
}
+.button.flat,
+.button.flat:insensitive {
+ border-color: transparent;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+}
+
/****************
* cell and row *
****************/
@@ -359,15 +387,18 @@ GtkCheckButton:selected:focus {
* column-header *
*****************/
column-header .button,
-column-header .button:active {
+column-header .button:active,
+column-header .button:checked {
border-width: 0 1px 1px 0;
border-radius: 0;
}
column-header .button,
column-header .button:active,
+column-header .button:checked,
column-header .button:focus,
-column-header .button:active:focus {
+column-header .button:active:focus,
+column-header .button:checked:focus {
border-color: shade(@theme_bg_color, 0.97);
border-bottom-color: shade(@theme_bg_color, 0.9);
background-image: linear-gradient(to bottom,
@@ -378,8 +409,10 @@ column-header .button:active:focus {
column-header .button:hover,
column-header .button:active:hover,
+column-header .button:checked:hover,
column-header .button:hover:focus,
-column-header .button:active:hover:focus {
+column-header .button:active:hover:focus,
+column-header .button:checked:hover:focus {
border-color: shade(@theme_bg_color, 0.97);
border-bottom-color: shade(@theme_bg_color, 0.9);
background-image: linear-gradient(to bottom,
@@ -439,7 +472,7 @@ GtkIconView.content-view.check:selected {
* drawing area *
****************/
GtkDrawingArea {
- background-color: @theme_base_color;
+ background-color: transparent;
}
GtkDrawingArea:insensitive {
@@ -519,10 +552,12 @@ GtkComboBox.combobox-entry .entry:insensitive {
.primary-toolbar GtkComboBox.combobox-entry .button,
.primary-toolbar GtkComboBox.combobox-entry .button:hover,
.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:checked,
.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
GtkComboBox.combobox-entry .button,
GtkComboBox.combobox-entry .button:hover,
GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:checked,
GtkComboBox.combobox-entry .button:insensitive {
border-width: 1px 1px 1px 1px;
border-bottom-left-radius: 0;
@@ -599,29 +634,42 @@ GtkComboBox.combobox-entry .button:insensitive {
* list boxes *
**************/
.list {
- background-color: shade(@theme_bg_color, 0.97);
- color: @theme_fg_color;
+ background-image: none;
+ background-color: transparent;
+}
+
+.list-row {
+ border: none;
+ border-radius: 0;
+ padding: 3px;
+ background-image: none;
+ background-color: transparent;
}
.list-row:hover {
+ background-image: none;
background-color: shade(@theme_bg_color, 1.02);
}
.list-row:selected {
+ background-image: none;
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
/*********
* frame *
- *********/
+*********/
.frame {
- border-width: 1px;
- border-style: solid;
- border-color: shade(@theme_bg_color, 0.7);
+ border: 1px solid shade(@theme_bg_color, 0.7);
border-radius: 0;
}
+.frame.flat {
+ border: none;
+ box-shadow: none;
+}
+
/*******************
* scrolled window *
*******************/
@@ -632,7 +680,7 @@ GtkScrolledWindow.frame {
border-radius: 0;
}
-/* avoid double borders when a viewport is
+/* avoid double borders when a viewport is
* packed into a GtkScrolledWindow */
GtkScrolledWindow GtkViewport.frame {
border-style: none;
@@ -646,7 +694,6 @@ GtkIconView.view.cell:selected:focus {
border-width: 1px;
border-style: solid;
border-color: shade(@theme_selected_bg_color, 0.8);
- border-radius: 3px;
background-image: linear-gradient(to bottom,
shade(@theme_selected_bg_color, 1.2),
shade(@theme_selected_bg_color, 1.0)
@@ -709,7 +756,8 @@ GtkInfoBar {
);
}
-.info .button:active {
+.info .button:active,
+.info .button:checked {
border-color: shade(@info_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@info_bg_color, 0.85), 1.05),
@@ -717,7 +765,8 @@ GtkInfoBar {
);
}
-.info .button:active:hover {
+.info .button:active:hover,
+.info .button:checked:hover {
border-top-color: shade(@info_bg_color, 0.85);
border-right-color: shade(@info_bg_color, 0.78);
border-left-color: shade(@info_bg_color, 0.78);
@@ -782,7 +831,8 @@ GtkInfoBar {
);
}
-.warning .button:active {
+.warning .button:active,
+.warning .button:checked {
border-color: shade(@warning_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@warning_bg_color, 0.85), 1.05),
@@ -790,7 +840,8 @@ GtkInfoBar {
);
}
-.warning .button:active:hover {
+.warning .button:active:hover,
+.warning .button:checked:hover {
border-top-color: shade(@warning_bg_color, 0.85);
border-right-color: shade(@warning_bg_color, 0.78);
border-left-color: shade(@warning_bg_color, 0.78);
@@ -855,7 +906,8 @@ GtkInfoBar {
);
}
-.question .button:active {
+.question .button:active,
+.question .button:checked {
border-color: shade(@question_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@question_bg_color, 0.85), 1.05),
@@ -863,7 +915,8 @@ GtkInfoBar {
);
}
-.question .button:active:hover {
+.question .button:active:hover,
+.question .button:checked:hover {
border-top-color: shade(@question_bg_color, 0.85);
border-right-color: shade(@question_bg_color, 0.78);
border-left-color: shade(@question_bg_color, 0.78);
@@ -928,7 +981,8 @@ GtkInfoBar {
);
}
-.error .button:active {
+.error .button:active,
+.error .button:checked {
border-color: shade(@error_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@error_bg_color, 0.85), 1.05),
@@ -936,7 +990,8 @@ GtkInfoBar {
);
}
-.error .button:active:hover {
+.error .button:active:hover,
+.error .button:checked:hover {
border-top-color: shade(@error_bg_color, 0.85);
border-right-color: shade(@error_bg_color, 0.78);
border-left-color: shade(@error_bg_color, 0.78);
@@ -1091,7 +1146,9 @@ GtkComboBox .menu {
.menu.button:hover,
.menu.button:active,
-.menu.button:active *:insensitive,
+.menu.button:checked,
+.menu.button:active:insensitive,
+.menu.button:checked:insensitive,
.menu.button:insensitive,
.menu.button {
border-width: 0;
@@ -1188,8 +1245,7 @@ GtkTreeMenu .menuitem {
color: @theme_selected_fg_color;
}
-.menu .menuitem:insensitive,
-.menu .menuitem *:insensitive {
+.menu .menuitem:insensitive {
color: mix(@menu_fg_color, @menu_bg_color, 0.4);
}
@@ -1255,15 +1311,25 @@ GtkPopover {
margin: 10px;
padding: 2px;
border-radius: 3px;
- border-color: shade(@theme_bg_color, 0.8);
+ border-color: shade(@menu_bg_color, 0.8);
border-width: 1px;
border-style: solid;
background-clip: border-box;
- background-color: @theme_bg_color;
- color: @theme_fg_color;
+ background-image: none;
+ background-color: @menu_bg_color;
+ color: @menu_fg_color;
box-shadow: 0 2px 3px alpha(black, 0.5);
}
+GtkPopover.background {
+ background-image: none;
+ background-color: @menu_bg_color;
+}
+
+GtkPopover:backdrop {
+ box-shadow: none;
+}
+
GtkPopover.osd {
box-shadow: 0 2px 7px 3px alpha(black, 0.5);
}
@@ -1271,9 +1337,41 @@ GtkPopover.osd {
GtkPopover > .list,
GtkPopover > .view,
GtkPopover > .toolbar {
+ background-image: none;
background-color: transparent;
}
+GtkPopover .list-row {
+ color: @menu_fg_color;
+}
+
+GtkPopover .list-row:hover {
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_selected_bg_color, 1.2),
+ shade(@theme_selected_bg_color, 1.0)
+ );
+ color: @theme_selected_fg_color;
+}
+
+GtkPopover .frame {
+ border: 1px solid mix(@menu_bg_color, @menu_fg_color, 0.12);
+ border-radius: 2px;
+}
+
+GtkPopover .entry {
+ border-color: mix(@menu_bg_color, @menu_fg_color, 0.12);
+ background-color: @menu_bg_color;
+ background-image: none;
+ color: @menu_fg_color;
+}
+
+GtkPopover .entry:hover,
+GtkPopover .entry:focus,
+GtkPopover .entry:active {
+ border-color: mix(@menu_bg_color, @menu_fg_color, 0.21);
+}
+
GtkPopover.osd > .toolbar .button {
border-radius: 0;
border-width: 0;
@@ -1289,26 +1387,65 @@ GtkPopover .separator {
font-weight: bold;
}
-GtkModelButton.button,
+.menuitem.button {
+ color: @theme_fg_color;
+}
+
+.menuitem.button,
+.menuitem.button:active,
+.menuitem.button:checked,
+.menuitem.button:insensitive,
+.menuitem.button:active:insensitive,
+.menuitem.button:checked:insensitive {
+ background-color: transparent;
+ background-image: none;
+ border-width: 1px;
+ box-shadow: none;
+ color: @menu_fg_color;
+}
+
+.menuitem.button:active:hover,
+.menuitem.button:checked:hover,
+.menuitem.button:hover,
+.menuitem.button:selected {
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_selected_bg_color, 1.2),
+ shade(@theme_selected_bg_color, 1.0)
+ );
+ color: @theme_selected_fg_color;
+}
+
+GtkModelButton.button {
+ color: @menu_fg_color;
+}
+
GtkModelButton.button:active,
+GtkModelButton.button:checked,
GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive {
+GtkModelButton.button:active:insensitive,
+GtkModelButton.button:checked:insensitive,
+GtkModelButton.button {
background-color: transparent;
background-image: none;
border-color: transparent;
- border-style: none;
+ border-image: none;
+ border-width: 1px;
box-shadow: none;
- color: @theme_fg_color;
}
GtkModelButton.button:active:hover,
+GtkModelButton.button:checked:hover,
GtkModelButton.button:hover,
GtkModelButton.button:selected {
- border-width: 0;
- border-color: transparent;
- background-color: @theme_selected_bg_color;
- background-image: none;
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_selected_bg_color, 1.2),
+ shade(@theme_selected_bg_color, 1.0)
+ );
color: @theme_selected_fg_color;
+ text-shadow: none;
+ border-width: 1px;
}
/************
@@ -1356,7 +1493,7 @@ GtkModelButton.button:selected {
.notebook GtkViewport {
border-width: 0;
- background-color: @theme_base_color;
+ background-color: transparent;
color: @theme_text_color;
}
@@ -1430,6 +1567,7 @@ GtkModelButton.button:selected {
/* close button styling */
.notebook tab .button,
.notebook tab .button:active,
+.notebook tab .button:checked,
.notebook tab .button:hover {
padding: 1px;
border-width: 1px;
@@ -1447,7 +1585,9 @@ GtkModelButton.button:selected {
}
.notebook tab .button:active,
-.notebook tab .button:active:hover {
+.notebook tab .button:checked,
+.notebook tab .button:active:hover,
+.notebook tab .button:checked:hover {
border-color: shade(@theme_base_color, 0.7);
background-color: shade(@theme_base_color, 0.95);
}
@@ -1848,7 +1988,9 @@ OsScrollbar:insensitive {
/*************
* separator *
*************/
+ .sidebar.separator,
.sidebar.view.separator,
+.sidebar .view.separator,
.view.separator,
.separator {
border-width: 1px;
@@ -1919,7 +2061,8 @@ OsScrollbar:insensitive {
border-color: shade(@titlebar_bg_color, 0.85);
}
-.menuitem.separator {
+.menuitem.separator,
+.menuitem .separator {
-GtkMenuItem-horizontal-padding: 0;
-GtkWidget-separator-height: 1;
@@ -1946,6 +2089,8 @@ GtkComboBox .separator {
.sidebar GtkScrolledWindow {
background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
color: mix(@theme_text_color, @theme_base_color, 0.3);
+ /* Don't use symbolic icons in the sidebar */
+ -gtk-icon-style: regular;
}
.sidebar row:selected,
@@ -2007,6 +2152,7 @@ GtkComboBox .separator {
}
.spinbutton .button:active,
+.spinbutton .button:checked,
.spinbutton .button:hover {
color: @theme_fg_color;
}
@@ -2052,7 +2198,8 @@ GtkComboBox .separator {
);
}
-.spinbutton.vertical .button:active {
+.spinbutton.vertical .button:active,
+.spinbutton.vertical .button:checked {
border-color: shade(@theme_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 0.85), 1.05),
@@ -2060,7 +2207,8 @@ GtkComboBox .separator {
);
}
-.spinbutton.vertical .button:active:hover {
+.spinbutton.vertical .button:active:hover,
+.spinbutton.vertical .button:checked:hover {
border-top-color: shade(@theme_bg_color, 0.85);
border-right-color: shade(@theme_bg_color, 0.78);
border-left-color: shade(@theme_bg_color, 0.78);
@@ -2074,7 +2222,9 @@ GtkComboBox .separator {
.spinbutton.vertical .button:focus,
.spinbutton.vertical .button:hover:focus,
.spinbutton.vertical .button:active:focus,
-.spinbutton.vertical .button:active:hover:focus {
+.spinbutton.vertical .button:checked:focus,
+.spinbutton.vertical .button:active:hover:focus,
+.spinbutton.vertical .button:checked:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
@@ -2114,115 +2264,26 @@ GtkComboBox .separator {
* spinner *
***********/
@keyframes spinner {
- 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-
- 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
-
- 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
-
- 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
-
- 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
-
- 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
-
- 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
-
- 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
-
- 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+ to { -gtk-icon-transform: rotate(1turn); }
}
.spinner {
- background-color: transparent;
- background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-
- background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
- background-size: 15% 15%;
- background-repeat: no-repeat;
+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+ color: @theme_fg_color;
+ opacity: 0;
}
.spinner:active {
- background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-
animation: spinner 1s infinite linear;
+ opacity: 1;
+}
+
+.spinner:active:backdrop {
+ color: @theme_fg_color;
+}
+
+.spinner:active:insensitive {
+ opacity: 0.5;
}
.menu.spinner,
@@ -2470,7 +2531,8 @@ GtkColorButton.button {
);
}
-.header-bar .button:active {
+.header-bar .button:active,
+.header-bar .button:checked {
border-color: shade(@titlebar_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@titlebar_bg_color, 0.85), 1.05),
@@ -2478,7 +2540,8 @@ GtkColorButton.button {
);
}
-.header-bar .button:active:hover {
+.header-bar .button:active:hover,
+.header-bar .button:checked:hover {
border-top-color: shade(@titlebar_bg_color, 0.85);
border-right-color: shade(@titlebar_bg_color, 0.78);
border-left-color: shade(@titlebar_bg_color, 0.78);
@@ -2492,7 +2555,9 @@ GtkColorButton.button {
.header-bar .button:focus,
.header-bar .button:hover:focus,
.header-bar .button:active:focus,
-.header-bar .button:active:hover:focus {
+.header-bar .button:checked:focus,
+.header-bar .button:active:hover:focus,
+.header-bar .button:checked:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
@@ -2504,7 +2569,8 @@ GtkColorButton.button {
);
}
-.header-bar .button:active *:insensitive {
+.header-bar .button:active:insensitive,
+.header-bar .button:checked:insensitive {
border-color: shade(@titlebar_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@titlebar_bg_color, 0.95), 1.05),
@@ -2593,6 +2659,24 @@ GtkColorButton.button {
color: @toolbar_fg_color;
}
+.primary-toolbar GtkComboBox.flat,
+.primary-toolbar .button.flat,
+.primary-toolbar GtkComboBox.flat,
+.primary-toolbar .button.flat,
+.toolbar GtkComboBox.flat,
+.toolbar .button.flat,
+.primary-toolbar GtkComboBox.flat:insensitive,
+.primary-toolbar .button.flat:insensitive,
+.primary-toolbar GtkComboBox.flat:insensitive,
+.primary-toolbar .button.flat:insensitive,
+.toolbar GtkComboBox.flat:insensitive,
+.toolbar .button.flat:insensitive {
+ border-color: transparent;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+}
+
.primary-toolbar .raised .button,
.primary-toolbar .raised.button,
.toolbar GtkComboBox,
@@ -2622,7 +2706,9 @@ GtkColorButton.button {
}
.primary-toolbar .button:active,
-.toolbar .button:active {
+.primary-toolbar .button:checked,
+.toolbar .button:active,
+.toolbar .button:checked {
border-color: shade(@toolbar_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@toolbar_bg_color, 0.85), 1.05),
@@ -2631,7 +2717,9 @@ GtkColorButton.button {
}
.primary-toolbar .button:active:hover,
-.toolbar .button:active:hover {
+.primary-toolbar .button:checked:hover,
+.toolbar .button:active:hover,
+.toolbar .button:checked:hover {
border-top-color: shade(@toolbar_bg_color, 0.85);
border-right-color: shade(@toolbar_bg_color, 0.78);
border-left-color: shade(@toolbar_bg_color, 0.78);
@@ -2645,11 +2733,15 @@ GtkColorButton.button {
.primary-toolbar .button:focus,
.primary-toolbar .button:hover:focus,
.primary-toolbar .button:active:focus,
+.primary-toolbar .button:checked:focus,
.primary-toolbar .button:active:hover:focus,
+.primary-toolbar .button:checked:hover:focus,
.toolbar .button:focus,
.toolbar .button:hover:focus,
.toolbar .button:active:focus,
-.toolbar .button:active:hover:focus {
+.toolbar .button:checked:focus,
+.toolbar .button:active:hover:focus,
+.toolbar .button:checked:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
@@ -2662,8 +2754,10 @@ GtkColorButton.button {
);
}
-.primary-toolbar .button:active *:insensitive,
-.toolbar .button:active *:insensitive {
+.primary-toolbar .button:active:insensitive,
+.primary-toolbar .button:checked:insensitive,
+.toolbar .button:active:insensitive,
+.toolbar .button:checked:insensitive {
border-color: shade(@toolbar_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@toolbar_bg_color, 0.95), 1.05),
@@ -2690,7 +2784,7 @@ GtkColorButton.button {
.inline-toolbar.toolbar {
-GtkToolbar-button-relief: normal;
- padding: 4px;
+ padding: 2px;
border-width: 1px;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
@@ -2709,7 +2803,7 @@ GtkColorButton.button {
}
.inline-toolbar.toolbar .button {
- padding: 2px;
+ padding: 4px;
border-width: 1px 0 1px 1px;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
@@ -2730,7 +2824,8 @@ GtkColorButton.button {
);
}
-.inline-toolbar.toolbar .button:active {
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:checked {
border-color: shade(@theme_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 0.85), 1.05),
@@ -2738,7 +2833,8 @@ GtkColorButton.button {
);
}
-.inline-toolbar.toolbar .button:active:hover {
+.inline-toolbar.toolbar .button:active:hover,
+.inline-toolbar.toolbar .button:checked:hover {
border-bottom-color: shade(@theme_bg_color, 0.75);
background-image: linear-gradient(to bottom,
shade(@theme_bg_color, 1.15),
@@ -2749,11 +2845,13 @@ GtkColorButton.button {
.inline-toolbar.toolbar .button:focus,
.inline-toolbar.toolbar .button:hover:focus,
.inline-toolbar.toolbar .button:active:focus,
-.inline-toolbar.toolbar .button:active:hover:focus {
+.inline-toolbar.toolbar .button:checked:focus,
+.inline-toolbar.toolbar .button:active:hover:focus,
+.inline-toolbar.toolbar .button:checked:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
-.inline-toolbar.toolbar .button *:insensitive,
+.inline-toolbar.toolbar .button:insensitive,
.inline-toolbar.toolbar GtkToolButton .button:insensitive {
border-color: shade(@theme_bg_color, 0.8);
background-image: linear-gradient(to bottom,
@@ -2770,14 +2868,20 @@ GtkColorButton.button {
.inline-toolbar.toolbar .button,
.inline-toolbar.toolbar GtkToolButton .button,
.inline-toolbar.toolbar GtkToolButton > .button {
+ padding: 6px;
+
box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8),
inset 1px 1px alpha(@light_shadow, 0.4);
}
.linked .button:active,
+.linked .button:checked,
.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:checked,
.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active {
+.inline-toolbar.toolbar GtkToolButton .button:checked,
+.inline-toolbar.toolbar GtkToolButton > .button:active,
+.inline-toolbar.toolbar GtkToolButton > .button:checked {
box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8),
inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
@@ -2792,12 +2896,18 @@ GtkColorButton.button {
}
/* remove box shadow from last-child and only-child */
-.linked .button:active *:insensitive:last-child,
-.linked .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar .button:active *:insensitive:last-child,
-.inline-toolbar.toolbar .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive {
+.linked .button:active:insensitive:last-child,
+.linked .button:checked:insensitive:last-child,
+.linked .button:active:insensitive:only-child,
+.linked .button:checked:insensitive:only-child,
+.inline-toolbar.toolbar .button:active:insensitive:last-child,
+.inline-toolbar.toolbar .button:checked:insensitive:last-child,
+.inline-toolbar.toolbar .button:active:insensitive:only-child,
+.inline-toolbar.toolbar .button:checked:insensitive:only-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked:insensitive,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked:insensitive {
box-shadow: none;
}
@@ -2824,11 +2934,17 @@ GtkColorButton.button {
}
.linked .button:active:last-child,
+.linked .button:checked:last-child,
.linked .button:active:only-child,
+.linked .button:checked:only-child,
.inline-toolbar.toolbar .button:active:last-child,
+.inline-toolbar.toolbar .button:checked:last-child,
.inline-toolbar.toolbar .button:active:only-child,
+.inline-toolbar.toolbar .button:checked:only-child,
.inline-toolbar.toolbar GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active {
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:active,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
}
@@ -2837,13 +2953,17 @@ GtkColorButton.button {
.linked .entry,
.linked .button,
.linked .button:active,
+.linked .button:checked,
.linked .button:active:hover,
+.linked .button:checked:hover,
.linked .button:insensitive,
.inline-toolbar.toolbar .button,
.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:checked,
.inline-toolbar.toolbar .button:insensitive,
.inline-toolbar.toolbar GtkToolButton .button,
.inline-toolbar.toolbar GtkToolButton .button:active,
+.inline-toolbar.toolbar GtkToolButton .button:checked,
.inline-toolbar.toolbar GtkToolButton .button:insensitive {
border-width: 1px;
border-radius: 0;
@@ -2855,13 +2975,17 @@ GtkColorButton.button {
.linked .entry:first-child,
.linked .button:first-child,
.linked .button:active:first-child,
+.linked .button:checked:first-child,
.linked .button:active:hover:first-child,
+.linked .button:checked:hover:first-child,
.linked .button:insensitive:first-child,
.inline-toolbar.toolbar .button:first-child,
.inline-toolbar.toolbar .button:active:first-child,
+.inline-toolbar.toolbar .button:checked:first-child,
.inline-toolbar.toolbar .button:insensitive:first-child,
.inline-toolbar.toolbar GtkToolButton:first-child .button,
.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:checked,
.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive {
border-width: 1px;
border-radius: 3px;
@@ -2874,13 +2998,17 @@ GtkColorButton.button {
.linked .entry:last-child,
.linked .button:last-child,
.linked .button:active:last-child,
+.linked .button:checked:last-child,
.linked .button:active:hover:last-child,
+.linked .button:checked:hover:last-child,
.linked .button:insensitive:last-child,
.inline-toolbar.toolbar .button:last-child,
.inline-toolbar.toolbar .button:active:last-child,
+.inline-toolbar.toolbar .button:checked:last-child,
.inline-toolbar.toolbar .button:insensitive:last-child,
.inline-toolbar.toolbar GtkToolButton:last-child .button,
.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:checked,
.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive {
border-width: 1px;
border-radius: 3px;
@@ -2893,13 +3021,17 @@ GtkColorButton.button {
.linked .entry:only-child,
.linked .button:only-child,
.linked .button:active:only-child,
+.linked .button:checked:only-child,
.linked .button:active:hover:only-child,
+.linked .button:checked:hover:only-child,
.linked .button:insensitive:only-child,
.inline-toolbar.toolbar .button:only-child,
.inline-toolbar.toolbar .button:active:only-child,
+.inline-toolbar.toolbar .button:checked:only-child,
.inline-toolbar.toolbar .button:insensitive:only-child,
.inline-toolbar.toolbar GtkToolButton:only-child .button,
.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:checked,
.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
border-width: 1px;
border-radius: 3px;
@@ -2915,8 +3047,11 @@ GtkColorButton.button {
}
.linked.vertical .button:active,
+.linked.vertical .button:checked,
.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active {
+.inline-toolbar.toolbar.vertical .button:checked,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
box-shadow: inset 0 -1px shade(@theme_bg_color, 0.8),
inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
@@ -2931,12 +3066,18 @@ GtkColorButton.button {
}
/* remove box shadow from last-child and only-child */
-.linked.vertical .button:active *:insensitive:last-child,
-.linked.vertical .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive {
+.linked.vertical .button:active:insensitive:last-child,
+.linked.vertical .button:checked:insensitive:last-child,
+.linked.vertical .button:active:insensitive:only-child,
+.linked.vertical .button:checked:insensitive:only-child,
+.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child,
+.inline-toolbar.toolbar.vertical .button:checked:insensitive:last-child,
+.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child,
+.inline-toolbar.toolbar.vertical .button:checked:insensitive:only-child,
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive,
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked:insensitive,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked:insensitive {
box-shadow: none;
}
@@ -2962,11 +3103,17 @@ GtkColorButton.button {
}
.linked.vertical .button:active:last-child,
+.linked.vertical .button:checked:last-child,
.linked.vertical .button:active:only-child,
+.linked.vertical .button:checked:only-child,
.inline-toolbar.toolbar.vertical .button:active:last-child,
+.inline-toolbar.toolbar.vertical .button:checked:last-child,
.inline-toolbar.toolbar.vertical .button:active:only-child,
+.inline-toolbar.toolbar.vertical .button:checked:only-child,
.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active {
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
}
@@ -2975,7 +3122,9 @@ GtkColorButton.button {
.linked.vertical .entry,
.linked.vertical .button,
.linked.vertical .button:active,
+.linked.vertical .button:checked,
.linked.vertical .button:active:hover,
+.linked.vertical .button:checked:hover,
.linked.vertical .button:insensitive {
border-width: 1px;
border-radius: 0;
@@ -2987,7 +3136,9 @@ GtkColorButton.button {
.linked.vertical .entry:first-child,
.linked.vertical .button:first-child,
.linked.vertical .button:active:first-child,
+.linked.vertical .button:checked:first-child,
.linked.vertical .button:active:hover:first-child,
+.linked.vertical .button:checked:hover:first-child,
.linked.vertical .button:insensitive:first-child {
border-width: 1px;
border-radius: 3px;
@@ -3000,7 +3151,9 @@ GtkColorButton.button {
.linked.vertical .entry:last-child,
.linked.vertical .button:last-child,
.linked.vertical .button:active:last-child,
+.linked.vertical .button:checked:last-child,
.linked.vertical .button:active:hover:last-child,
+.linked.vertical .button:checked:hover:last-child,
.linked.vertical .button:insensitive:last-child {
border-width: 1px;
border-radius: 3px;
@@ -3013,7 +3166,9 @@ GtkColorButton.button {
.linked.vertical .entry:only-child,
.linked.vertical .button:only-child,
.linked.vertical .button:active:only-child,
+.linked.vertical .button:checked:only-child,
.linked.vertical .button:active:hover:only-child,
+.linked.vertical .button:checked:hover:only-child,
.linked.vertical .button:insensitive:only-child {
border-width: 1px;
border-radius: 3px;
@@ -3030,10 +3185,15 @@ GtkColorButton.button {
}
.primary-toolbar .button.raised.linked:active,
+.primary-toolbar .button.raised.linked:checked,
.primary-toolbar .raised.linked .button:active,
+.primary-toolbar .raised.linked .button:checked,
.toolbar .button.raised.linked:active,
+.toolbar .button.raised.linked:checked,
.toolbar .raised.linked .button:active,
-.toolbar .linked .button:active {
+.toolbar .raised.linked .button:checked,
+.toolbar .linked .button:active,
+.toolbar .linked .button:checked {
box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8),
inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
@@ -3049,16 +3209,26 @@ GtkColorButton.button {
}
/* remove box shadow from last-child and only-child */
-.primary-toolbar .button:active *:insensitive.raised.linked:last-child,
-.primary-toolbar .button:active *:insensitive.raised.linked:only-child,
-.primary-toolbar .raised.linked .button:active *:insensitive:last-child,
-.primary-toolbar .raised.linked .button:active *:insensitive:only-child,
-.toolbar .button:active *:insensitive.raised.linked:last-child,
-.toolbar .button:active *:insensitive.raised.linked:only-child,
-.toolbar .raised.linked .button:active *:insensitive:last-child,
-.toolbar .raised.linked .button:active *:insensitive:only-child,
-.toolbar .linked .button:active *:insensitive:last-child,
-.toolbar .linked .button:active *:insensitive:only-child {
+.primary-toolbar .button:active:insensitive.raised.linked:last-child,
+.primary-toolbar .button:checked:insensitive.raised.linked:last-child,
+.primary-toolbar .button:active:insensitive.raised.linked:only-child,
+.primary-toolbar .button:checked:insensitive.raised.linked:only-child,
+.primary-toolbar .raised.linked .button:active:insensitive:last-child,
+.primary-toolbar .raised.linked .button:checked:insensitive:last-child,
+.primary-toolbar .raised.linked .button:active:insensitive:only-child,
+.primary-toolbar .raised.linked .button:checked:insensitive:only-child,
+.toolbar .button:active:insensitive.raised.linked:last-child,
+.toolbar .button:checked:insensitive.raised.linked:last-child,
+.toolbar .button:active:insensitive.raised.linked:only-child,
+.toolbar .button:checked:insensitive.raised.linked:only-child,
+.toolbar .raised.linked .button:active:insensitive:last-child,
+.toolbar .raised.linked .button:checked:insensitive:last-child,
+.toolbar .raised.linked .button:active:insensitive:only-child,
+.toolbar .raised.linked .button:checked:insensitive:only-child,
+.toolbar .linked .button:active:insensitive:last-child,
+.toolbar .linked .button:checked:insensitive:last-child,
+.toolbar .linked .button:active:insensitive:only-child
+.toolbar .linked .button:checked:insensitive:only-child {
box-shadow: none;
}
@@ -3092,15 +3262,25 @@ GtkColorButton.button {
}
.primary-toolbar .button:active.raised.linked:last-child,
+.primary-toolbar .button:checked.raised.linked:last-child,
.primary-toolbar .button:active.raised.linked:only-child,
+.primary-toolbar .button:checked.raised.linked:only-child,
.primary-toolbar .raised.linked .button:active:last-child,
+.primary-toolbar .raised.linked .button:checked:last-child,
.primary-toolbar .raised.linked .button:active:only-child,
+.primary-toolbar .raised.linked .button:checked:only-child,
.toolbar .button:active.raised.linked:last-child,
+.toolbar .button:checked.raised.linked:last-child,
.toolbar .button:active.raised.linked:only-child,
+.toolbar .button:checked.raised.linked:only-child,
.toolbar .raised.linked .button:active:last-child,
+.toolbar .raised.linked .button:checked:last-child,
.toolbar .raised.linked .button:active:only-child,
+.toolbar .raised.linked .button:checked:only-child,
.toolbar .linked .button:active:last-child,
-.toolbar .linked .button:active:only-child {
+.toolbar .linked .button:checked:last-child,
+.toolbar .linked .button:active:only-child,
+.toolbar .linked .button:checked:only-child {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
}
@@ -3108,18 +3288,23 @@ GtkColorButton.button {
/* middle button */
.primary-toolbar .button.raised.linked,
.primary-toolbar .button.raised.linked:active,
+.primary-toolbar .button.raised.linked:checked,
.primary-toolbar .button.raised.linked:insensitive,
.primary-toolbar .raised.linked .button,
.primary-toolbar .raised.linked .button:active,
+.primary-toolbar .raised.linked .button:checked,
.primary-toolbar .raised.linked .button:insensitive,
.toolbar .button.raised.linked,
.toolbar .button.raised.linked:active,
+.toolbar .button.raised.linked:checked,
.toolbar .button.raised.linked:insensitive,
.toolbar .raised.linked .button,
.toolbar .raised.linked .button:active,
+.toolbar .raised.linked .button:checked,
.toolbar .raised.linked .button:insensitive,
.toolbar .linked .button,
.toolbar .linked .button:active,
+.toolbar .linked .button:checked,
.toolbar .linked .button:insensitive {
border-width: 1px;
border-radius: 0;
@@ -3130,18 +3315,23 @@ GtkColorButton.button {
/* leftmost button */
.primary-toolbar .button.raised.linked:first-child,
.primary-toolbar .button.raised.linked:active:first-child,
+.primary-toolbar .button.raised.linked:checked:first-child,
.primary-toolbar .button.raised.linked:insensitive:first-child,
.primary-toolbar .raised.linked .button:first-child,
.primary-toolbar .raised.linked .button:active:first-child,
+.primary-toolbar .raised.linked .button:checked:first-child,
.primary-toolbar .raised.linked .button:insensitive:first-child,
.toolbar .button.raised.linked:first-child,
.toolbar .button.raised.linked:active:first-child,
+.toolbar .button.raised.linked:checked:first-child,
.toolbar .button.raised.linked:insensitive:first-child,
.toolbar .raised.linked .button:first-child,
.toolbar .raised.linked .button:active:first-child,
+.toolbar .raised.linked .button:checked:first-child,
.toolbar .raised.linked .button:insensitive:first-child,
.toolbar .linked .button:first-child,
.toolbar .linked .button:active:first-child,
+.toolbar .linked .button:checked:first-child,
.toolbar .linked .button:insensitive:first-child {
border-width: 1px;
border-radius: 3px;
@@ -3153,18 +3343,23 @@ GtkColorButton.button {
/* rightmost button */
.primary-toolbar .button.raised.linked:last-child,
.primary-toolbar .button.raised.linked:active:last-child,
+.primary-toolbar .button.raised.linked:checked:last-child,
.primary-toolbar .button.raised.linked:insensitive:last-child,
.primary-toolbar .raised.linked .button:last-child,
.primary-toolbar .raised.linked .button:active:last-child,
+.primary-toolbar .raised.linked .button:checked:last-child,
.primary-toolbar .raised.linked .button:insensitive:last-child,
.toolbar .button.raised.linked:last-child,
.toolbar .button.raised.linked:active:last-child,
+.toolbar .button.raised.linked:checked:last-child,
.toolbar .button.raised.linked:insensitive:last-child,
.toolbar .raised.linked .button:last-child,
.toolbar .raised.linked .button:active:last-child,
+.toolbar .raised.linked .button:checked:last-child,
.toolbar .raised.linked .button:insensitive:last-child,
.toolbar .linked .button:last-child,
.toolbar .linked .button:active:last-child,
+.toolbar .linked .button:checked:last-child,
.toolbar .linked .button:insensitive:last-child {
border-width: 1px;
border-radius: 3px;
@@ -3176,18 +3371,23 @@ GtkColorButton.button {
/* linked single button */
.primary-toolbar .button.raised.linked:only-child,
.primary-toolbar .button.raised.linked:active:only-child,
+.primary-toolbar .button.raised.linked:checked:only-child,
.primary-toolbar .button.raised.linked:insensitive:only-child,
.primary-toolbar .raised.linked .button:only-child,
.primary-toolbar .raised.linked .button:active:only-child,
+.primary-toolbar .raised.linked .button:checked:only-child,
.primary-toolbar .raised.linked .button:insensitive:only-child,
.toolbar .button.raised.linked:only-child,
.toolbar .button.raised.linked:active:only-child,
+.toolbar .button.raised.linked:checked:only-child,
.toolbar .button.raised.linked:insensitive:only-child,
.toolbar .raised.linked .button:only-child,
.toolbar .raised.linked .button:active:only-child,
+.toolbar .raised.linked .button:checked:only-child,
.toolbar .raised.linked .button:insensitive:only-child,
.toolbar .linked .button:only-child,
.toolbar .linked .button:active:only-child,
+.toolbar .linked .button:checked:only-child,
.toolbar .linked .button:insensitive:only-child {
border-width: 1px;
border-radius: 3px;
@@ -3202,8 +3402,11 @@ GtkColorButton.button {
}
.header-bar .button.raised.linked:active,
+.header-bar .button.raised.linked:checked,
.header-bar .raised.linked .button:active,
-.header-bar .linked .button:active {
+.header-bar .raised.linked .button:checked,
+.header-bar .linked .button:active,
+.header-bar .linked .button:checked {
box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.8),
inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
@@ -3217,12 +3420,18 @@ GtkColorButton.button {
}
/* remove box shadow from last-child and only-child */
-.header-bar .button:active *:insensitive.raised.linked:last-child,
-.header-bar .button:active *:insensitive.raised.linked:only-child,
-.header-bar .raised.linked .button:active *:insensitive:last-child,
-.header-bar .raised.linked .button:active *:insensitive:only-child,
-.header-bar .linked .button:active *:insensitive:last-child,
-.header-bar .linked .button:active *:insensitive:only-child {
+.header-bar .button:active:insensitive.raised.linked:last-child,
+.header-bar .button:checked:insensitive.raised.linked:last-child,
+.header-bar .button:active:insensitive.raised.linked:only-child,
+.header-bar .button:checked:insensitive.raised.linked:only-child,
+.header-bar .raised.linked .button:active:insensitive:last-child,
+.header-bar .raised.linked .button:checked:insensitive:last-child,
+.header-bar .raised.linked .button:active:insensitive:only-child,
+.header-bar .raised.linked .button:checked:insensitive:only-child,
+.header-bar .linked .button:active:insensitive:last-child,
+.header-bar .linked .button:checked:insensitive:last-child,
+.header-bar .linked .button:active:insensitive:only-child,
+.header-bar .linked .button:checked:insensitive:only-child {
box-shadow: none;
}
@@ -3248,11 +3457,17 @@ GtkColorButton.button {
}
.header-bar .button:active.raised.linked:last-child,
+.header-bar .button:checked.raised.linked:last-child,
.header-bar .button:active.raised.linked:only-child,
+.header-bar .button:checked.raised.linked:only-child,
.header-bar .raised.linked .button:active:last-child,
+.header-bar .raised.linked .button:checked:last-child,
.header-bar .raised.linked .button:active:only-child,
+.header-bar .raised.linked .button:checked:only-child,
.header-bar .linked .button:active:last-child,
-.header-bar .linked .button:active:only-child {
+.header-bar .linked .button:checked:last-child,
+.header-bar .linked .button:active:only-child,
+.header-bar .linked .button:checked:only-child {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
}
@@ -3260,12 +3475,15 @@ GtkColorButton.button {
/* middle button */
.header-bar .button.raised.linked,
.header-bar .button.raised.linked:active,
+.header-bar .button.raised.linked:checked,
.header-bar .button.raised.linked:insensitive,
.header-bar .raised.linked .button,
.header-bar .raised.linked .button:active,
+.header-bar .raised.linked .button:checked,
.header-bar .raised.linked .button:insensitive,
.header-bar .linked .button,
.header-bar .linked .button:active,
+.header-bar .linked .button:checked,
.header-bar .linked .button:insensitive {
border-width: 1px;
border-radius: 0;
@@ -3276,12 +3494,15 @@ GtkColorButton.button {
/* leftmost button */
.header-bar .button.raised.linked:first-child,
.header-bar .button.raised.linked:active:first-child,
+.header-bar .button.raised.linked:checked:first-child,
.header-bar .button.raised.linked:insensitive:first-child,
.header-bar .raised.linked .button:first-child,
.header-bar .raised.linked .button:active:first-child,
+.header-bar .raised.linked .button:checked:first-child,
.header-bar .raised.linked .button:insensitive:first-child,
.header-bar .linked .button:first-child,
.header-bar .linked .button:active:first-child,
+.header-bar .linked .button:checked:first-child,
.header-bar .linked .button:insensitive:first-child {
border-width: 1px;
border-radius: 3px;
@@ -3293,12 +3514,15 @@ GtkColorButton.button {
/* rightmost button */
.header-bar .button.raised.linked:last-child,
.header-bar .button.raised.linked:active:last-child,
+.header-bar .button.raised.linked:checked:last-child,
.header-bar .button.raised.linked:insensitive:last-child,
.header-bar .raised.linked .button:last-child,
.header-bar .raised.linked .button:active:last-child,
+.header-bar .raised.linked .button:checked:last-child,
.header-bar .raised.linked .button:insensitive:last-child,
.header-bar .linked .button:last-child,
.header-bar .linked .button:active:last-child,
+.header-bar .linked .button:checked:last-child,
.header-bar .linked .button:insensitive:last-child {
border-width: 1px;
border-radius: 3px;
@@ -3310,12 +3534,15 @@ GtkColorButton.button {
/* linked single button */
.header-bar .button.raised.linked:only-child,
.header-bar .button.raised.linked:active:only-child,
+.header-bar .button.raised.linked:checked:only-child,
.header-bar .button.raised.linked:insensitive:only-child,
.header-bar .raised.linked .button:only-child,
.header-bar .raised.linked .button:active:only-child,
+.header-bar .raised.linked .button:checked:only-child,
.header-bar .raised.linked .button:insensitive:only-child,
.header-bar .linked .button:only-child,
.header-bar .linked .button:active:only-child,
+.header-bar .linked .button:checked:only-child,
.header-bar .linked .button:insensitive:only-child {
border-width: 1px;
border-radius: 3px;
@@ -3324,7 +3551,8 @@ GtkColorButton.button {
/***********
* tooltip *
***********/
-.tooltip {
+.tooltip,
+.tooltip.background {
border-width: 1px;
border-style: solid;
border-color: alpha(@theme_tooltip_bg_color, 0.9);
@@ -3506,9 +3734,9 @@ GtkOverlay.osd {
padding: 4px;
border-width: 1px;
border-style: solid;
- border-color: shade(@osd_bg, 0.8);
- border-radius: 3px;
- background-color: shade(@osd_bg, 1.05);
+ border-color: transparent;
+ border-radius: 2px;
+ background-color: transparent;
background-image: none;
color: @osd_fg;
}
@@ -3516,34 +3744,44 @@ GtkOverlay.osd {
.osd.button:prelight,
.osd.button:hover,
.osd .button:hover {
- border-color: shade(@osd_bg, 0.7);
+ border-color: shade(@osd_bg, 0.6);
background-color: shade(@osd_bg, 1.15);
background-image: none;
}
.osd.button:active,
+.osd.button:checked,
.osd .button:active,
-.osd GtkMenuButton.button:active {
- border-color: shade(@osd_bg, 0.8);
- background-color: shade(@osd_bg, 0.95);
- background-image: none;
+.osd .button:checked,
+.osd GtkMenuButton.button:active,
+.osd GtkMenuButton.button:checked {
+ border-color: shade(@osd_bg, 0.4);
+ background-color: shade(@osd_bg, 0.65);
+ background-image: linear-gradient(to bottom,
+ shade(@osd_bg, 0.5),
+ shade(@osd_bg, 0.75)
+ );
}
.osd.button:active:hover,
+.osd.button:checked:hover,
.osd .button:active:hover,
+.osd .button:checked:hover,
.osd GtkMenuButton.button:active:hover {
- border-color: shade(@osd_bg, 0.7);
+ border-color: shade(@osd_bg, 0.4);
}
.osd.button:insensitive,
.osd .button:insensitive {
- border-color: shade(@osd_bg, 0.85);
+ border-color: transparent;
background-color: shade(@osd_bg, 0.9);
background-image: none;
}
-.osd.button:active *:insensitive,
-.osd .button:active *:insensitive {
+.osd.button:active:insensitive,
+.osd.button:checked:insensitive,
+.osd .button:active:insensitive,
+.osd .button:checked:insensitive {
background-color: shade(@osd_bg, 0.80);
background-image: none;
}
@@ -3578,20 +3816,24 @@ GtkOverlay.osd {
background-image: none;
}
-.osd.toolbar .button:active {
+.osd.toolbar .button:active,
+.osd.toolbar .button:checked {
border-color: shade(@osd_bg, 0.8);
background-color: shade(@osd_bg, 0.95);
background-image: none;
}
-.osd.toolbar .button:active:hover {
+.osd.toolbar .button:active:hover,
+.osd.toolbar .button:checked:hover {
border-color: shade(@osd_bg, 0.7);
}
.osd.toolbar .button:focus,
.osd.toolbar .button:hover:focus,
.osd.toolbar .button:active:focus,
-.osd.toolbar .button:active:hover:focus {
+.osd.toolbar .button:checked:focus,
+.osd.toolbar .button:active:hover:focus,
+.osd.toolbar .button:checked:hover:focus {
border-color: shade(@osd_bg, 0.7);
}
@@ -3601,7 +3843,8 @@ GtkOverlay.osd {
background-image: none;
}
-.osd.toolbar .button:active *:insensitive {
+.osd.toolbar .button:active:insensitive,
+.osd.toolbar .button:checked:insensitive {
border-color: shade(@osd_bg, 0.75);
background-color: shade(@osd_bg, 0.80);
background-image: none;
@@ -3734,7 +3977,8 @@ GtkProgressBar.osd.progressbar {
background-color: shade(@osd_bg, 0.8);
}
-.osd .scrollbar.slider:active {
+.osd .scrollbar.slider:active,
+.osd .scrollbar.slider:checked {
border-color: shade(@theme_selected_bg_color, 0.9);
background-color: @theme_selected_bg_color;
}
@@ -3743,7 +3987,6 @@ GtkProgressBar.osd.progressbar {
.osd GtkIconView.cell:selected:focus {
background-color: transparent;
border-style: solid;
- border-radius: 3px;
border-width: 3px;
border-color: @osd_fg;
outline-color: transparent;
@@ -3783,7 +4026,8 @@ GtkProgressBar.osd.progressbar {
);
}
-.destructive-action.button:active {
+.destructive-action.button:active,
+.destructive-action.button:checked {
border-color: shade(@error_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@error_color, 1.2), 1.05),
@@ -3791,7 +4035,8 @@ GtkProgressBar.osd.progressbar {
);
}
-.destructive-action.button:hover:active {
+.destructive-action.button:hover:active,
+.destructive-action.button:hover:checked {
border-color: shade(@error_color, 0.7);
background-image: linear-gradient(to bottom,
shade(mix(@theme_base_color, @error_color, 0.7), 1.05),
@@ -3823,7 +4068,8 @@ GtkProgressBar.osd.progressbar {
);
}
-.suggested-action.button:active {
+.suggested-action.button:active,
+.suggested-action.button:checked {
border-color: shade(@theme_selected_bg_color, 0.7);
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 0.85), 1.05),
@@ -3831,7 +4077,8 @@ GtkProgressBar.osd.progressbar {
);
}
-.suggested-action.button:hover:active {
+.suggested-action.button:hover:active,
+.suggested-action.button:hover:checked {
border-color: shade(@theme_selected_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(@theme_bg_color, 1.15),
@@ -3891,8 +4138,11 @@ GtkProgressBar.osd.progressbar {
}
.selection-mode.header-bar .button:active,
+.selection-mode.header-bar .button:checked,
.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active {
+.selection-mode.toolbar .button:checked,
+.selection-mode.toolbar GtkToolButton .button:active,
+.selection-mode.toolbar GtkToolButton .button:checked {
border-color: shade(@theme_selected_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@theme_selected_bg_color, 1.2), 1.05),
@@ -3901,8 +4151,11 @@ GtkProgressBar.osd.progressbar {
}
.selection-mode.header-bar .button:hover:active,
+.selection-mode.header-bar .button:hover:checked,
.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active {
+.selection-mode.toolbar .button:hover:checked,
+.selection-mode.toolbar GtkToolButton .button:hover:active,
+.selection-mode.toolbar GtkToolButton .button:hover:checked {
border-color: shade(@theme_selected_bg_color, 0.7);
background-image: linear-gradient(to bottom,
shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05),
@@ -3937,8 +4190,11 @@ GtkProgressBar.osd.progressbar {
}
.selection-mode.header-bar .suggested-action.button:active,
+.selection-mode.header-bar .suggested-action.button:checked,
.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active {
+.selection-mode.toolbar .suggested-action.button:checked,
+.selection-mode.toolbar GtkToolButton.suggested-action:active,
+.selection-mode.toolbar GtkToolButton.suggested-action:checked {
border-color: shade(@theme_selected_bg_color, 0.7);
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 0.85), 1.05),
@@ -3947,8 +4203,11 @@ GtkProgressBar.osd.progressbar {
}
.selection-mode.header-bar .suggested-action.button:hover:active,
+.selection-mode.header-bar .suggested-action.button:hover:checked,
.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active {
+.selection-mode.toolbar .suggested-action.button:hover:checked,
+.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
+.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
border-color: shade(@theme_selected_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(@theme_bg_color, 1.15),
@@ -3978,7 +4237,9 @@ GtkProgressBar.osd.progressbar {
}
.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active {
+.selection-mode.header-bar .selection-menu.button:checked,
+.selection-mode.toolbar .selection-menu.button:active,
+.selection-mode.toolbar .selection-menu.button:checked {
color: shade(@theme_selected_bg_color, 0.7);
box-shadow: none;
}
@@ -4031,7 +4292,8 @@ GtkBubbleWindow .toolbar {
.titlebar .title {
font: bold;
- text-shadow: 0 1px shade(@titlebar_bg_color, 1.2);
+ color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.3);
+ text-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
}
.titlebar:backdrop {
@@ -4042,7 +4304,8 @@ GtkBubbleWindow .toolbar {
}
.titlebar .title:backdrop {
- text-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
+ color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.6);
+ text-shadow: 0 1px shade(@titlebar_bg_color, 1.05);
}
.titlebar .titlebutton {
@@ -4050,7 +4313,7 @@ GtkBubbleWindow .toolbar {
border-style: none;
background: none;
color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.3);
- icon-shadow: 0 1px shade(@titlebar_bg_color, 1.2);
+ icon-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
box-shadow: none;
}
@@ -4062,7 +4325,9 @@ GtkBubbleWindow .toolbar {
}
.titlebar .titlebutton:active,
-.titlebar .titlebutton:active:hover {
+.titlebar .titlebutton:checked,
+.titlebar .titlebutton:active:hover,
+.titlebar .titlebutton:checked:hover {
background: none;
color: @theme_selected_bg_color;
box-shadow: none;
@@ -4086,8 +4351,8 @@ GtkBubbleWindow .toolbar {
.titlebar .titlebutton:backdrop {
background-image: none;
- color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
- icon-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
+ color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.6);
+ icon-shadow: 0 1px shade(@titlebar_bg_color, 1.05);
}
.window-frame {
@@ -4108,3 +4373,22 @@ GtkBubbleWindow .toolbar {
box-shadow: 0 3px 5px alpha(black, 0.5),
0 0 0 1px alpha(black, 0.2);
}
+
+.window-frame.csd.popup {
+ border-style: none;
+ border-radius: 0;
+ box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+}
+
+.window-frame.csd.tooltip {
+ border-radius: 4px;
+ box-shadow: none;
+}
+
+.window-frame.solid-csd {
+ border: solid 1px shade(@theme_bg_color, 0.5);
+ border-radius: 0;
+ margin: 2px;
+ background-color: @theme_bg_color;
+ box-shadow: none;
+}
\ No newline at end of file
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 29c8975bb0f562feef776fcd24a59fb360d836fd..e04f7667a30c172487d8032e0dd82183acf11458 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -3,7 +3,7 @@
@define-color fg_color #3c3c3c;
@define-color base_color #fcfcfc;
@define-color text_color #212121;
-@define-color selected_bg_color #9bc264;
+@define-color selected_bg_color #398ee7;
@define-color selected_fg_color #fff;
@define-color tooltip_bg_color #000;
@define-color tooltip_fg_color #e1e1e1;
@@ -31,7 +31,7 @@
@define-color question_bg_color rgb (57, 142, 231);
@define-color error_fg_color rgb (251, 214, 214);
@define-color error_bg_color rgb (237, 54, 54);
-@define-color link_color #1b983b;
+@define-color link_color #2d71b8;
@define-color success_color #4e9a06;
@define-color warning_color #f57900;
@define-color error_color #cc0000;
@@ -56,15 +56,15 @@
/* window manager colors */
@define-color wm_bg_a shade(@titlebar_bg_color, 1.07);
@define-color wm_bg_b @titlebar_bg_color;
-@define-color wm_title_focused shade(@titlebar_fg_color, 1.2);
-@define-color wm_title_focused_shadow shade(@titlebar_bg_color, 1.2);
-@define-color wm_title_unfocused shade(@titlebar_fg_color, 2.0);
-@define-color wm_title_unfocused_shadow shade(@titlebar_bg_color, 1.1);
+@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.3);
+@define-color wm_title_focused_shadow shade(@titlebar_bg_color, 1.1);
+@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.6);
+@define-color wm_title_unfocused_shadow shade(@titlebar_bg_color, 1.05);
@define-color wm_border_focused shade(@titlebar_bg_color, 0.7);
@define-color wm_border_unfocused shade(@titlebar_bg_color, 0.8);
/* lightdm greeter color scheme */
-@define-color lightdm_bg_color #242424;
+@define-color lightdm_bg_color #f9f9f9;
@define-color lightdm_fg_color #3c3c3c;
@import url("gtk-widgets.css");
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index f4157c921b78f35f1ddeda2ddceef56448b185eb..9aa01e5563b85e0df541edf2247ef7ae03f26564 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,4 +1,3 @@
[Settings]
-gtk-color-scheme = "base_color:#fcfcfc\nbg_color:#cecece\ntooltip_bg_color:#000000\nselected_bg_color:#9bc264\ntext_color:#212121\nfg_color:#3c3c3c\ntooltip_fg_color:#e1e1e1\nselected_fg_color:#ffffff\nlink_color:#1b983b"
gtk-auto-mnemonics = 1
gtk-visible-focus = automatic
diff --git a/metacity-1/close_focused_pressed.png b/metacity-1/close_focused_pressed.png
index 70773ce608410dd0e1beb0afdb249af1fca1ddee..4c8e020b85b76b743427cfa8fb2526cc89180e9c 100644
Binary files a/metacity-1/close_focused_pressed.png and b/metacity-1/close_focused_pressed.png differ
diff --git a/metacity-1/maximize_focused_pressed.png b/metacity-1/maximize_focused_pressed.png
index 2a1f7409aef94c8d22936eb2c48fad97ed6c7c39..39c86431a7fcb43026aca7d643d9d39d062e8b9c 100644
Binary files a/metacity-1/maximize_focused_pressed.png and b/metacity-1/maximize_focused_pressed.png differ
diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml
index 267c65283b385f1548144b222633ffbab7b869e7..27b6dc4872afcccea431d3bc9d2785aa94f2d7cc 100644
--- a/metacity-1/metacity-theme-2.xml
+++ b/metacity-1/metacity-theme-2.xml
@@ -2,7 +2,7 @@
<metacity_theme>
<info>
<name>Greenbird</name>
- <author>Philip Müller</author>
+ <author>Philip Müller & Satyajit Sahoo</author>
<copyright>GPL-3.0+</copyright>
<date>August, 2013</date>
<description>Greenbird Metacity theme</description>
@@ -13,10 +13,10 @@
<constant name="C_titlebar_gradient_b" value="gtk:bg[NORMAL]" />
<constant name="C_border_focused" value="shade/gtk:bg[NORMAL]/0.7" />
<constant name="C_border_unfocused" value="shade/gtk:bg[NORMAL]/0.8" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_shadow" value="shade/gtk:bg[NORMAL]/1.2" />
+<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.3" />
+<constant name="C_title_focused_shadow" value="shade/gtk:bg[NORMAL]/1.1" />
<constant name="C_title_unfocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" />
-<constant name="C_title_unfocused_shadow" value="shade/gtk:bg[NORMAL]/1.1" />
+<constant name="C_title_unfocused_shadow" value="shade/gtk:bg[NORMAL]/1.05" />
<!-- ::: GEOMETRY ::: -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
index 3b7cd0970753e39396544e285da8e43407cf2ce6..5caebbacbe29d75cccc07adfc4aca1558dd92929 100644
--- a/metacity-1/metacity-theme-3.xml
+++ b/metacity-1/metacity-theme-3.xml
@@ -2,7 +2,7 @@
<metacity_theme>
<info>
<name>Greenbird</name>
- <author>Philip Müller</author>
+ <author>Philip Müller & Satyajit Sahoo</author>
<copyright>GPL-3.0+</copyright>
<date>July, 2012</date>
<description>Greenbird Mutter theme</description>
@@ -13,10 +13,10 @@
<constant name="C_titlebar_gradient_b" value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
<constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.7)" />
<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.8)" />
-<constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1)" />
-<constant name="C_title_focused_shadow" value="gtk:custom(wm_title_focused_shadow,shade/gtk:bg[NORMAL]/1.2)" />
+<constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.3)" />
+<constant name="C_title_focused_shadow" value="gtk:custom(wm_title_focused_shadow,shade/gtk:bg[NORMAL]/1.1)" />
<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)" />
-<constant name="C_title_unfocused_shadow" value="gtk:custom(wm_title_unfocused_shadow,shade/gtk:bg[NORMAL]/1.1)" />
+<constant name="C_title_unfocused_shadow" value="gtk:custom(wm_title_unfocused_shadow,shade/gtk:bg[NORMAL]/1.05)" />
<!-- ::: GEOMETRY ::: -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
diff --git a/metacity-1/minimize_focused_pressed.png b/metacity-1/minimize_focused_pressed.png
index 95ada1c3f877d0b7e53e3cf48caa7fc759614887..675859205677c52994cd3a624497a29074d73337 100644
Binary files a/metacity-1/minimize_focused_pressed.png and b/metacity-1/minimize_focused_pressed.png differ
diff --git a/metacity-1/shade_focused_pressed.png b/metacity-1/shade_focused_pressed.png
index c69bfc5641f5afa5ca2fbef2db61f94aa43d7f42..ce21280f67bfee4b8d7d0e03f7334e33839bba53 100644
Binary files a/metacity-1/shade_focused_pressed.png and b/metacity-1/shade_focused_pressed.png differ
diff --git a/metacity-1/unmaximize_focused_pressed.png b/metacity-1/unmaximize_focused_pressed.png
index f106f09638d9bd1701eb2de36d3d70ebbe2ab8be..21c9b2a4cab1ade1a73d497eda4f086c066c5e0f 100644
Binary files a/metacity-1/unmaximize_focused_pressed.png and b/metacity-1/unmaximize_focused_pressed.png differ
diff --git a/metacity-1/unshade_focused_pressed.png b/metacity-1/unshade_focused_pressed.png
index 7c4dfe92153f61424eb58629239bb93f571d5557..a68356d867144b37518757dd15ec6f025c4cc1f9 100644
Binary files a/metacity-1/unshade_focused_pressed.png and b/metacity-1/unshade_focused_pressed.png differ
diff --git a/ubiquity-panel-bg.png b/ubiquity-panel-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e2fcb5c19398068f9e09e9b37b15a90c6e3d229
Binary files /dev/null and b/ubiquity-panel-bg.png differ
diff --git a/unity/close_focused_pressed.png b/unity/close_focused_pressed.png
index 8cca0d53993059a134e63814f8bec37f387f8ea4..0cd49d4e9c42eb779694a4c8bd90aae13a062b6d 100644
Binary files a/unity/close_focused_pressed.png and b/unity/close_focused_pressed.png differ
diff --git a/unity/maximize_focused_pressed.png b/unity/maximize_focused_pressed.png
index 7ddf92b0fbe64c1a5980cd92c7289742ba723667..0b6614c400c62e167295a0917943c593093f52db 100644
Binary files a/unity/maximize_focused_pressed.png and b/unity/maximize_focused_pressed.png differ
diff --git a/unity/minimize_focused_pressed.png b/unity/minimize_focused_pressed.png
index 943f38a416be7792d10d20e088a7c8df9c0f2c93..690e736deef882348f586c4a791ce0d0076053d3 100644
Binary files a/unity/minimize_focused_pressed.png and b/unity/minimize_focused_pressed.png differ
diff --git a/unity/unmaximize_focused_pressed.png b/unity/unmaximize_focused_pressed.png
index 9656591e0fa089ab82d15d87c9069bbe09536561..df702a63f60290c2ba76d299dad1ca2e798da10a 100644
Binary files a/unity/unmaximize_focused_pressed.png and b/unity/unmaximize_focused_pressed.png differ
diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc
index 30a6800e27bfb655aff1d24e37ddfc285ad7cfb7..b5172fa667196066fcd7c0d1d12a2b65d7329e86 100644
--- a/xfce-notify-4.0/gtkrc
+++ b/xfce-notify-4.0/gtkrc
@@ -37,15 +37,17 @@ style "notify-summary"
style "notify-progressbar"
{
- xthickness = 1
- ythickness = 1
+ GtkProgressBar::min-horizontal-bar-height = 4
+ xthickness = 0
+ ythickness = 0
fg[PRELIGHT] = "#000000"
- bg[NORMAL] = "#dbdbdb"
- bg[SELECTED] = "#dbdbdb"
+ bg[NORMAL] = "#fefefe"
+ bg[SELECTED] = "#fefefe"
+ bg[ACTIVE] = "#696969"
engine "murrine" {
- gradient_shades = {1.1,0.95,1.1,0.85}
+ gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
contrast = 0.5
border_shades = { 0.9, 0.9 }
progressbarstyle = 0
diff --git a/xfce-notify-4.0_bright/gtkrc b/xfce-notify-4.0_bright/gtkrc
new file mode 100644
index 0000000000000000000000000000000000000000..abe4851cfbd612afa5ca3dba88b7c3ffe41e1b1d
--- /dev/null
+++ b/xfce-notify-4.0_bright/gtkrc
@@ -0,0 +1,75 @@
+style "notify-window"
+
+{
+ XfceNotifyWindow::summary-bold = 1
+ XfceNotifyWindow::border-color = "#686868"
+ XfceNotifyWindow::border-color-hover = "#686868"
+ XfceNotifyWindow::border-radius = 10.0
+ XfceNotifyWindow::border-width = 0.5
+ XfceNotifyWindow::border-width-hover = 0.5
+ bg[NORMAL] = "#f2f1f1"
+ engine "murrine" {
+ textstyle = 1
+ text_shade = 1.1
+ }
+}
+
+style "notify-button"
+{
+ bg[NORMAL] = "#f1f1f1"
+ bg[PRELIGHT] = "#e4e4e4"
+ bg[ACTIVE] = "#ddd"
+ fg[NORMAL] = "#686868"
+ fg[PRELIGHT] = "#686868"
+ fg[ACTIVE] = "#000"
+ engine "murrine" {
+ gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+ border_shades = { 1.15, 1.15 }
+ contrast = 1.0
+ roundness = 4
+ textstyle = 1
+ text_shade = 1.1
+ }
+}
+
+style "notify-text"
+{
+ fg[NORMAL] = "#686868"
+ fg[PRELIGHT] = "#000"
+ GtkWidget::link-color = "#a7a7a7"
+ engine "murrine" {
+ textstyle = 0
+ }
+}
+
+style "notify-summary"
+{
+ font_name = "Bold"
+}
+
+style "notify-progressbar"
+{
+ xthickness = 1
+ ythickness = 1
+
+ fg[PRELIGHT] = "#ddd"
+ bg[NORMAL] = "#f1f1f1"
+ bg[SELECTED] = "#f1f1f1"
+
+ engine "murrine" {
+ gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+ contrast = 1.0
+ border_shades = { 1.35, 1.35 }
+ trough_shades = { 2.85, 3.25 }
+ trough_border_shades = { 1.1, 1.1 }
+ progressbarstyle = 0
+ roundness = 6
+ }
+}
+
+class "XfceNotifyWindow" style "notify-window"
+widget "XfceNotifyWindow.*.summary" style "notify-summary"
+widget_class "XfceNotifyWindow.*GtkButton*" style "notify-button"
+widget_class "XfceNotifyWindow.*.<GtkLabel>" style "notify-text"
+widget_class "XfceNotifyWindow.*.<GtkProgress>" style "notify-progressbar"
+widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style "notify-progressbar"
diff --git a/xfwm4/bottom-inactive.xpm b/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0ec965bb6567071440cb99a2d74bf00d6fe611ff..0000000000000000000000000000000000000000
--- a/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"2 2 3 1",
-" c None",
-". c #DEDEDE s active_color_2",
-"+ c #939393",
-"..",
-"++"};
diff --git a/xfwm4/bottom-inactive.xpm b/xfwm4/bottom-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..9f10639247fea7f217a97b558ddf76496e40d6fc
--- /dev/null
+++ b/xfwm4/bottom-inactive.xpm
@@ -0,0 +1 @@
+bottom-active.xpm
\ No newline at end of file
diff --git a/xfwm4/bottom-left-inactive.xpm b/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 5b65d0b5ac9d720af717ec160db609cffc54e994..0000000000000000000000000000000000000000
--- a/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" c None",
-". c #939393",
-"+ c #DEDEDE s active_color_2",
-".+",
-".."};
diff --git a/xfwm4/bottom-left-inactive.xpm b/xfwm4/bottom-left-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..d70de34a7a92edb60d2f0f4e6e80d5779c24e044
--- /dev/null
+++ b/xfwm4/bottom-left-inactive.xpm
@@ -0,0 +1 @@
+bottom-left-active.xpm
\ No newline at end of file
diff --git a/xfwm4/bottom-right-inactive.xpm b/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 9e3d478cf059b1320c95d550e1d6b08f7f10ddcb..0000000000000000000000000000000000000000
--- a/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" c None",
-". c #DEDEDE s active_color_2",
-"+ c #939393",
-".+",
-"++"};
diff --git a/xfwm4/bottom-right-inactive.xpm b/xfwm4/bottom-right-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..d234cea5f6c332e56433ef0d0b4c2a84ef20f9cd
--- /dev/null
+++ b/xfwm4/bottom-right-inactive.xpm
@@ -0,0 +1 @@
+bottom-right-active.xpm
\ No newline at end of file
diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm
index 45ff939a45bd8075c8e460a6e261089de4750f24..13cda0c7c87170ac9efff4aeb392d651862ead36 100644
--- a/xfwm4/close-pressed.xpm
+++ b/xfwm4/close-pressed.xpm
@@ -1,15 +1,25 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"20 24 9 1",
+"20 24 19 1",
" c None",
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #ACCB87",
-"$ c #9BC364",
+"# c #70BC68",
+"$ c #5BB551",
"% c #ECECEC",
-"& c #C4E1A1",
-"* c #9BC264",
+"& c #62BA58",
+"* c #62BB59",
+"= c #63BA5A",
+"- c #6CC163",
+"; c #75C86C",
+"> c #75C76D",
+", c #7FCF77",
+"' c #7ECF75",
+") c #7DCF77",
+"! c #7ECE76",
+"~ c #87D57F",
+"{ c #86D680",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -22,11 +32,11 @@ static char * close_pressed_xpm[] = {
"@@@@@@##@@@@##@@@@@@",
"@@@@@@$$#@@#$$@@@@@@",
"@@@@@@%$$##$$%@@@@@@",
-"@@@@@@@%$$$$%@@@@@@@",
-"@@@@@@@@&**&@@@@@@@@",
-"@@@@@@@&####&@@@@@@@",
-"@@@@@@&##%%##&@@@@@@",
-"@@@@@@##%@@%##@@@@@@",
+"@@@@@@@%&**=%@@@@@@@",
+"@@@@@@@@----@@@@@@@@",
+"@@@@@@@#;;>;#@@@@@@@",
+"@@@@@@#,'%%)!#@@@@@@",
+"@@@@@@~~%@@%~{@@@@@@",
"@@@@@@%%@@@@%%@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm
index 04bc15cf296fe4694cf87c7b733373bad599a925..0d977f8d538042a03c6a7e5d9a104a8d47598eb8 100644
--- a/xfwm4/hide-pressed.xpm
+++ b/xfwm4/hide-pressed.xpm
@@ -5,8 +5,8 @@ static char * hide_pressed_xpm[] = {
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #9BC364",
-"$ c #ACCB87",
+"# c #6EBA66",
+"$ c #93D88C",
"% c #ECECEC",
"....................",
"++++++++++++++++++++",
diff --git a/xfwm4/left-inactive.xpm b/xfwm4/left-inactive.xpm
deleted file mode 100644
index c1019ae114940fafcb9ad39a28a00931c9d7521f..0000000000000000000000000000000000000000
--- a/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 1 3 1",
-" c None",
-". c #939393",
-"+ c #DEDEDE s active_color_2",
-".+"};
diff --git a/xfwm4/left-inactive.xpm b/xfwm4/left-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..ebcf490321b98661a3589a6087587de782a98577
--- /dev/null
+++ b/xfwm4/left-inactive.xpm
@@ -0,0 +1 @@
+left-active.xpm
\ No newline at end of file
diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm
index 7cf019a6db0892fd4beea1db21d948b29d9c2d91..a92589d9feb3c57da3e2a91246952382ff1a90b8 100644
--- a/xfwm4/maximize-pressed.xpm
+++ b/xfwm4/maximize-pressed.xpm
@@ -1,14 +1,17 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"20 24 8 1",
+"20 24 11 1",
" c None",
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #A3C48E",
-"$ c #ACCB87",
-"% c #F4F4F4",
-"& c #9BC364",
+"# c #5BB551",
+"$ c #5CB553",
+"% c #65BC5C",
+"& c #7ACB71",
+"* c #F4F4F4",
+"= c #93D88C",
+"- c #9ADD93",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -19,14 +22,14 @@ static char * maximize_pressed_xpm[] = {
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@##@@@@@@@@@",
-"@@@@@@@@@##@@@@@@@@@",
-"@@@@@@@@@##@@@@@@@@@",
-"@@@@@@########@@@@@@",
-"@@@@@@$$$$$$$$@@@@@@",
-"@@@@@@%%%$$%%%@@@@@@",
-"@@@@@@@@@&&@@@@@@@@@",
-"@@@@@@@@@&&@@@@@@@@@",
+"@@@@@@@@@$$@@@@@@@@@",
"@@@@@@@@@%%@@@@@@@@@",
+"@@@@@@%%%%%%%%@@@@@@",
+"@@@@@@&&&&&&&&@@@@@@",
+"@@@@@@***&&***@@@@@@",
+"@@@@@@@@@==@@@@@@@@@",
+"@@@@@@@@@--@@@@@@@@@",
+"@@@@@@@@@**@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/menu-pressed.xpm b/xfwm4/menu-pressed.xpm
index bb53410eee24d8c449ec832183a180a1444cbbb4..8b117f1e6354a448fcd6e054b47a20799f0cf68e 100644
--- a/xfwm4/menu-pressed.xpm
+++ b/xfwm4/menu-pressed.xpm
@@ -1,24 +1,34 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"20 24 18 1",
+"20 24 28 1",
" c None",
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #C4E1A1",
-"$ c #A3C48E",
-"% c #EBECED",
-"& c #DFDFDF",
-"* c #E1E9EE",
-"= c #9BC264",
-"- c #E8ECEF",
-"; c #E1E1E1",
-"> c #E0F3C5",
-", c #E0E8EE",
-"' c #E0E0E0",
-") c #E6E6E6",
-"! c #E2E2E2",
-"~ c #EDEDED",
+"# c #8BC385",
+"$ c #5CB553",
+"% c #8FC589",
+"& c #EBECED",
+"* c #81C87C",
+"= c #65BC5C",
+"- c #8DCC86",
+"; c #DFDFDF",
+"> c #E4EEE2",
+", c #7AC672",
+"' c #70C367",
+") c #84CB7D",
+"! c #E9EFE9",
+"~ c #E1E1E1",
+"{ c #D1EACE",
+"] c #7ACB71",
+"^ c #83CD79",
+"/ c #E1EEE0",
+"( c #E0E0E0",
+"_ c #E6E6E6",
+": c #B8E3B3",
+"< c #D4EBD1",
+"[ c #E2E2E2",
+"} c #EDEDED",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -30,12 +40,12 @@ static char * menu_pressed_xpm[] = {
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@#$$$$$$#@@@@@@",
-"@@@@@@%#$$$$#%@@@@@@",
-"@@@@@@&*#==#-@@@@@@@",
-"@@@@@@@;>##,'@@@@@@@",
-"@@@@@@@@)#>!@@@@@@@@",
-"@@@@@@@@@~)@@@@@@@@@",
+"@@@@@@#$$$$$$%@@@@@@",
+"@@@@@@&*====-&@@@@@@",
+"@@@@@@;>,'')!@@@@@@@",
+"@@@@@@@~{]^/(@@@@@@@",
+"@@@@@@@@_:<[@@@@@@@@",
+"@@@@@@@@@}_@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/right-inactive.xpm b/xfwm4/right-inactive.xpm
deleted file mode 100644
index 5b15e1e50298b01d7e6d382ce6fb16d824bef1a4..0000000000000000000000000000000000000000
--- a/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 1 3 1",
-" c None",
-". c #DEDEDE s active_color_2",
-"+ c #939393",
-".+"};
diff --git a/xfwm4/right-inactive.xpm b/xfwm4/right-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..6734f48a83612f12fe8f0389f9d92acba2a1e677
--- /dev/null
+++ b/xfwm4/right-inactive.xpm
@@ -0,0 +1 @@
+right-active.xpm
\ No newline at end of file
diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm
index 05d7d954915deb85175fe67988ac005e191375d9..03969c6c29a904bfdad8deac7b912806ad826a58 100644
--- a/xfwm4/shade-pressed.xpm
+++ b/xfwm4/shade-pressed.xpm
@@ -1,17 +1,28 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"20 24 11 1",
+"20 24 22 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #C4E1A1",
-"$ c #A3C48E",
-"% c #ACCB87",
-"& c #EAEBEC",
-"* c #E1E8EC",
-"= c #E8EAED",
-"- c #BCDBA7",
+"# c #78C870",
+"$ c #82CA78",
+"% c #77C36F",
+"& c #6FC066",
+"* c #82C77B",
+"= c #81C47A",
+"- c #64B95B",
+"; c #6EC165",
+"> c #70C167",
+", c #8BCA84",
+"' c #89C183",
+") c #5BB252",
+"! c #8DC389",
+"~ c #EAECEA",
+"{ c #E3ECE2",
+"] c #E9EDE9",
+"^ c #92D58B",
+"/ c #99DA92",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -21,15 +32,15 @@ static char * shade_pressed_xpm[] = {
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@#$@@@@@@@@@",
+"@@@@@@@@%&&*@@@@@@@@",
+"@@@@@@@=-;>-,@@@@@@@",
+"@@@@@@')!;;!)!@@@@@@",
+"@@@@@@~{];;]]~@@@@@@",
"@@@@@@@@@##@@@@@@@@@",
-"@@@@@@@@#$$#@@@@@@@@",
-"@@@@@@@#%$$%#@@@@@@@",
-"@@@@@@#%#$$#%#@@@@@@",
-"@@@@@@&*=$$==&@@@@@@",
-"@@@@@@@@@##@@@@@@@@@",
-"@@@@@@@@@--@@@@@@@@@",
-"@@@@@@@@@%%@@@@@@@@@",
-"@@@@@@@@@==@@@@@@@@@",
+"@@@@@@@@@^^@@@@@@@@@",
+"@@@@@@@@@//@@@@@@@@@",
+"@@@@@@@@@]]@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm
index 7cc3d48acbd580fe8950d68df5a5ba90bb36c7ad..43933be7d7bde12d38d3634be7f889d1f69f3a53 100644
--- a/xfwm4/shade-toggled-pressed.xpm
+++ b/xfwm4/shade-toggled-pressed.xpm
@@ -1,19 +1,29 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"20 24 13 1",
+"20 24 23 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #ACCB87",
-"$ c #9BC264",
-"% c #EBECED",
-"& c #E1E8ED",
-"* c #E8EBEE",
-"= c #D3F4AC",
-"- c #E0E8EE",
-"; c #DFDFDF",
-"> c #C4E1A1",
+"# c #8DCC86",
+"$ c #70C367",
+"% c #8BC385",
+"& c #5CB553",
+"* c #8EC589",
+"= c #EBECED",
+"- c #80C77B",
+"; c #65BC5C",
+"> c #E3EDE1",
+", c #78C670",
+"' c #83CA7C",
+") c #E8EBEE",
+"! c #D1EACE",
+"~ c #7ACB71",
+"{ c #81CD79",
+"] c #E1EEE0",
+"^ c #DFDFDF",
+"/ c #B7E3B3",
+"( c #D4EBD1",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -27,11 +37,11 @@ static char * shade_toggled_pressed_xpm[] = {
"@@@@@@@@@$$@@@@@@@@@",
"@@@@@@@@@$$@@@@@@@@@",
"@@@@@@@@@$$@@@@@@@@@",
-"@@@@@@###$$###@@@@@@",
-"@@@@@@%#$$$$#%@@@@@@",
-"@@@@@@@&$$$#*@@@@@@@",
-"@@@@@@@@=$#-;@@@@@@@",
-"@@@@@@@@@>=@@@@@@@@@",
+"@@@@@@%&*$$*&*@@@@@@",
+"@@@@@@=-;$$;#=@@@@@@",
+"@@@@@@@>,$$')@@@@@@@",
+"@@@@@@@@!~{]^@@@@@@@",
+"@@@@@@@@@/(@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm
index 642c3d34ee44000529abbab70169b70d30997677..e2e2c8b9dff0b80962de42eacf1ca57a109f0f68 100644
--- a/xfwm4/stick-pressed.xpm
+++ b/xfwm4/stick-pressed.xpm
@@ -1,16 +1,27 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"20 24 10 1",
+"20 24 21 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #9BC364",
-"$ c #ECECEC",
-"% c #9BC264",
-"& c #ACCB87",
-"* c #A5C791",
-"= c #9FC39B",
+"# c #5BB551",
+"$ c #5BB652",
+"% c #5CB553",
+"& c #5CB652",
+"* c #62BB5B",
+"= c #63BC5A",
+"- c #ECECEC",
+"; c #64BB5B",
+"> c #6CC163",
+", c #75C86C",
+"' c #74C76B",
+") c #7DCE74",
+"! c #7CCD73",
+"~ c #83D37B",
+"{ c #85D37D",
+"] c #85D47C",
+"^ c #8DD985",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -21,14 +32,14 @@ static char * stick_pressed_xpm[] = {
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@####@@@@@@@@",
-"@@@@@@@######@@@@@@@",
-"@@@@@@##$$$$##@@@@@@",
-"@@@@@@%%@@@@%%@@@@@@",
-"@@@@@@&&@@@@&&@@@@@@",
-"@@@@@@&&@@@@&&@@@@@@",
-"@@@@@@$*=====$@@@@@@",
-"@@@@@@@$%%%%$@@@@@@@",
-"@@@@@@@@$$$$@@@@@@@@",
+"@@@@@@@$%&#$&@@@@@@@",
+"@@@@@@*=----;;@@@@@@",
+"@@@@@@>>@@@@>>@@@@@@",
+"@@@@@@,'@@@@''@@@@@@",
+"@@@@@@)!@@@@!)@@@@@@",
+"@@@@@@-~{{{]{-@@@@@@",
+"@@@@@@@-^^^^-@@@@@@@",
+"@@@@@@@@----@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm
index 5f4c2721f118499550d6506d63a2be24bd6b57bf..46c4c41d65a8eba0cd72c9b76c67139b7fe06ed2 100644
--- a/xfwm4/stick-toggled-pressed.xpm
+++ b/xfwm4/stick-toggled-pressed.xpm
@@ -1,15 +1,26 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"20 24 9 1",
+"20 24 20 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #ACCB87",
-"$ c #ECECEC",
-"% c #9BC364",
-"& c #A5C791",
-"* c #9FC39B",
+"# c #5BB551",
+"$ c #5BB652",
+"% c #5CB553",
+"& c #5CB652",
+"* c #62BB5B",
+"= c #63BC5A",
+"- c #ECECEC",
+"; c #6CC163",
+"> c #75C86C",
+", c #74C76B",
+"' c #7DCE74",
+") c #7CCD73",
+"! c #83D37B",
+"~ c #85D37D",
+"{ c #85D47C",
+"] c #8DD985",
"....................",
"++++++++++++++++++++",
"@@@@@@@@@@@@@@@@@@@@",
@@ -20,14 +31,14 @@ static char * stick_toggled_pressed_xpm[] = {
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@#@@@@@@@",
"@@@@@@@@##@@##@@@@@@",
-"@@@@@@@###@####@@@@@",
-"@@@@@@##$$@##$$@@@@@",
-"@@@@@@%%@@%$$@@@@@@@",
-"@@@@@@##@@$@##@@@@@@",
-"@@@@@@##@@@@##@@@@@@",
-"@@@@@@$&*****$@@@@@@",
-"@@@@@@@$%%%%$@@@@@@@",
-"@@@@@@@@$$$$@@@@@@@@",
+"@@@@@@@$%&@$$$$@@@@@",
+"@@@@@@*=--@==--@@@@@",
+"@@@@@@;;@@;--@@@@@@@",
+"@@@@@@>,@@-@,,@@@@@@",
+"@@@@@@')@@@@)'@@@@@@",
+"@@@@@@-!~~~{~-@@@@@@",
+"@@@@@@@-]]]]-@@@@@@@",
+"@@@@@@@@----@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@",
diff --git a/xfwm4/themerc b/xfwm4/themerc
index b4f5c31d07836bd8e7c684b48f2934ef743773b7..ed7a2caecfc0398e8ea3efdef99c637dcf4050c4 100644
--- a/xfwm4/themerc
+++ b/xfwm4/themerc
@@ -1,9 +1,8 @@
-# Author: Philip Müller <philm@manjaro.org>
-# Author of original greybird theme: Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
+# Author: Philip Müller <philm@manjaro.org> & Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
# Modified by: Marcelo Aguero <marceloaguero@gmail.com>
# Modified again by: Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
# Author of original metacity theme: elementart Art Team
-# Greybird theme for xfwm4 using GTK color pickup.
+# Greenbird theme for xfwm4 using GTK color pickup.
# License: GPL
# Date: January 2011
diff --git a/xfwm4/title-2-active.png b/xfwm4/title-2-active.png
deleted file mode 100644
index 2f3b966d7f4c1f2f5b4752d0d63fdee01dbfbb4c..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-2-active.png and /dev/null differ
diff --git a/xfwm4/title-2-active.png b/xfwm4/title-2-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4/title-2-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
deleted file mode 100644
index 0207b1410e33e68e5eb075111854679f98966e0b..0000000000000000000000000000000000000000
--- a/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4/title-2-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4/title-2-inactive.png b/xfwm4/title-2-inactive.png
deleted file mode 100644
index fa470998f52f3f639b3e0ef7f204f454d87b615b..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-2-inactive.png and /dev/null differ
diff --git a/xfwm4/title-2-inactive.png b/xfwm4/title-2-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4/title-2-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index 86f7ce0bcf836cdf609309adc5b72f226d9b1a7d..0000000000000000000000000000000000000000
--- a/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4/title-2-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4/title-3-active.png b/xfwm4/title-3-active.png
deleted file mode 100644
index 2f3b966d7f4c1f2f5b4752d0d63fdee01dbfbb4c..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-3-active.png and /dev/null differ
diff --git a/xfwm4/title-3-active.png b/xfwm4/title-3-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4/title-3-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
deleted file mode 100644
index 0207b1410e33e68e5eb075111854679f98966e0b..0000000000000000000000000000000000000000
--- a/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4/title-3-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4/title-3-inactive.png b/xfwm4/title-3-inactive.png
deleted file mode 100644
index fa470998f52f3f639b3e0ef7f204f454d87b615b..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-3-inactive.png and /dev/null differ
diff --git a/xfwm4/title-3-inactive.png b/xfwm4/title-3-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4/title-3-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index 86f7ce0bcf836cdf609309adc5b72f226d9b1a7d..0000000000000000000000000000000000000000
--- a/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4/title-3-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4/title-4-active.png b/xfwm4/title-4-active.png
deleted file mode 100644
index 2f3b966d7f4c1f2f5b4752d0d63fdee01dbfbb4c..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-4-active.png and /dev/null differ
diff --git a/xfwm4/title-4-active.png b/xfwm4/title-4-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4/title-4-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
deleted file mode 100644
index 0207b1410e33e68e5eb075111854679f98966e0b..0000000000000000000000000000000000000000
--- a/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4/title-4-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4/title-4-inactive.png b/xfwm4/title-4-inactive.png
deleted file mode 100644
index fa470998f52f3f639b3e0ef7f204f454d87b615b..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-4-inactive.png and /dev/null differ
diff --git a/xfwm4/title-4-inactive.png b/xfwm4/title-4-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4/title-4-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 86f7ce0bcf836cdf609309adc5b72f226d9b1a7d..0000000000000000000000000000000000000000
--- a/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4/title-4-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4/title-5-active.png b/xfwm4/title-5-active.png
deleted file mode 100644
index 2f3b966d7f4c1f2f5b4752d0d63fdee01dbfbb4c..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-5-active.png and /dev/null differ
diff --git a/xfwm4/title-5-active.png b/xfwm4/title-5-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4/title-5-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
deleted file mode 100644
index 0207b1410e33e68e5eb075111854679f98966e0b..0000000000000000000000000000000000000000
--- a/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4/title-5-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4/title-5-inactive.png b/xfwm4/title-5-inactive.png
deleted file mode 100644
index fa470998f52f3f639b3e0ef7f204f454d87b615b..0000000000000000000000000000000000000000
Binary files a/xfwm4/title-5-inactive.png and /dev/null differ
diff --git a/xfwm4/title-5-inactive.png b/xfwm4/title-5-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4/title-5-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index 86f7ce0bcf836cdf609309adc5b72f226d9b1a7d..0000000000000000000000000000000000000000
--- a/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4/title-5-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 20d345955bc50cec59ba33abdc666703c9d2bdde..0000000000000000000000000000000000000000
--- a/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"8 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-" ...",
-" ..+++",
-" .@@@@@",
-" .@@@@@@",
-" .@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@"};
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..05175262842f674a15605ec6d597f6bd5ef9b7df
--- /dev/null
+++ b/xfwm4/top-left-inactive.xpm
@@ -0,0 +1 @@
+top-left-active.xpm
\ No newline at end of file
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index 072370084a48c72543a21ebb404a94e8c6be59cf..0000000000000000000000000000000000000000
--- a/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"8 24 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"... ",
-"+++.. ",
-"@@@@@. ",
-"@@@@@@. ",
-"@@@@@@. ",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@."};
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..42cae620867e573705a52fcfe7e8093ee1f819bc
--- /dev/null
+++ b/xfwm4/top-right-inactive.xpm
@@ -0,0 +1 @@
+top-right-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/bottom-inactive.xpm b/xfwm4_compact/bottom-inactive.xpm
deleted file mode 100644
index 0ec965bb6567071440cb99a2d74bf00d6fe611ff..0000000000000000000000000000000000000000
--- a/xfwm4_compact/bottom-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"2 2 3 1",
-" c None",
-". c #DEDEDE s active_color_2",
-"+ c #939393",
-"..",
-"++"};
diff --git a/xfwm4_compact/bottom-inactive.xpm b/xfwm4_compact/bottom-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..9f10639247fea7f217a97b558ddf76496e40d6fc
--- /dev/null
+++ b/xfwm4_compact/bottom-inactive.xpm
@@ -0,0 +1 @@
+bottom-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/bottom-left-inactive.xpm b/xfwm4_compact/bottom-left-inactive.xpm
deleted file mode 100644
index 5b65d0b5ac9d720af717ec160db609cffc54e994..0000000000000000000000000000000000000000
--- a/xfwm4_compact/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" c None",
-". c #939393",
-"+ c #DEDEDE s active_color_2",
-".+",
-".."};
diff --git a/xfwm4_compact/bottom-left-inactive.xpm b/xfwm4_compact/bottom-left-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..d70de34a7a92edb60d2f0f4e6e80d5779c24e044
--- /dev/null
+++ b/xfwm4_compact/bottom-left-inactive.xpm
@@ -0,0 +1 @@
+bottom-left-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/bottom-right-inactive.xpm b/xfwm4_compact/bottom-right-inactive.xpm
deleted file mode 100644
index 9e3d478cf059b1320c95d550e1d6b08f7f10ddcb..0000000000000000000000000000000000000000
--- a/xfwm4_compact/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" c None",
-". c #DEDEDE s active_color_2",
-"+ c #939393",
-".+",
-"++"};
diff --git a/xfwm4_compact/bottom-right-inactive.xpm b/xfwm4_compact/bottom-right-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..d234cea5f6c332e56433ef0d0b4c2a84ef20f9cd
--- /dev/null
+++ b/xfwm4_compact/bottom-right-inactive.xpm
@@ -0,0 +1 @@
+bottom-right-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/close-pressed.xpm b/xfwm4_compact/close-pressed.xpm
index 3b1fc2cd9adabe24ca207ca24108ca503ebbfe27..8e899e918256d8d4b5c741412933d21fb851b086 100644
--- a/xfwm4_compact/close-pressed.xpm
+++ b/xfwm4_compact/close-pressed.xpm
@@ -1,46 +1,73 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"12 18 25 1",
+"12 18 52 1",
" c None",
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #CDD4D9",
-"$ c #ACCB87",
-"% c #D0D5D9",
-"& c #CED5DA",
-"* c #9BC264",
-"= c #D2D7DB",
-"- c #CFD5DA",
-"; c #E1E6EC",
-"> c #E2E7EC",
-", c #E1E1E1",
-"' c #E5EBEF",
-") c #E8EDF0",
-"! c #D7DBDF",
-"~ c #D4DADE",
-"{ c #D3D9DD",
-"] c #E9EEF1",
-"^ c #E7ECF1",
-"/ c #E4EAEE",
-"( c #E7EDF2",
-"_ c #E8EDF3",
-": c #F2F2F2",
+"# c #CFD9CD",
+"$ c #7EBF77",
+"% c #D1D9D1",
+"& c #CFDACE",
+"* c #7DBE76",
+"= c #7CC177",
+"- c #5BB551",
+"; c #70BC68",
+"> c #D3DBD3",
+", c #D0DAD0",
+"' c #6EBA66",
+") c #7DC076",
+"! c #E2E6EC",
+"~ c #7AC472",
+"{ c #65BC5C",
+"] c #7BC274",
+"^ c #78C070",
+"/ c #7EC676",
+"( c #E2E7EC",
+"_ c #E1E1E1",
+": c #E6EFE5",
+"< c #84CB7D",
+"[ c #70C367",
+"} c #89CE82",
+"| c #E9F0E8",
+"1 c #D7DBDF",
+"2 c #90D389",
+"3 c #7ACB71",
+"4 c #8CD185",
+"5 c #D5DED4",
+"6 c #D4DDD3",
+"7 c #92D58B",
+"8 c #83D27A",
+"9 c #95D88E",
+"0 c #93D88C",
+"a c #91D48A",
+"b c #A2DC9C",
+"c c #8DD985",
+"d c #9CDD95",
+"e c #EAF1E9",
+"f c #E7ECF1",
+"g c #9ADD93",
+"h c #E5EEE4",
+"i c #A9E4A4",
+"j c #E9F2E8",
+"k c #E9EDF3",
+"l c #AAE4A4",
+"m c #F2F2F2",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
-"@@#$%@@&$#@@",
-"@@$**=-$*$@@",
-"@@;$****$>@@",
-"@@,'****),@@",
-"@@@!****~@@@",
-"@@{**$$**{@@",
-"@@$*$]^$*$@@",
-"@@/$(,,_$/@@",
-"@@,:,@@,:,@@",
+"@@#$%@@&*#@@",
+"@@=-;>,'-)@@",
+"@@!~{]^{/(@@",
+"@@_:<[[}|_@@",
+"@@@123345@@@",
+"@@678908a6@@",
+"@@bcdefgcb@@",
+"@@hij__klh@@",
+"@@_m_@@_m_@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@"};
diff --git a/xfwm4_compact/hide-pressed.xpm b/xfwm4_compact/hide-pressed.xpm
index c807b0776b5832d8abdca21fecc9e7b2761596e6..5e6b61137dd2cae37987ca97509f1adb0b45d321 100644
--- a/xfwm4_compact/hide-pressed.xpm
+++ b/xfwm4_compact/hide-pressed.xpm
@@ -5,8 +5,8 @@ static char * hide_pressed_xpm[] = {
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #9BC264",
-"$ c #ACCB87",
+"# c #6EBA66",
+"$ c #93D88C",
"% c #ECECEC",
"............",
"++++++++++++",
diff --git a/xfwm4_compact/left-inactive.xpm b/xfwm4_compact/left-inactive.xpm
deleted file mode 100644
index c1019ae114940fafcb9ad39a28a00931c9d7521f..0000000000000000000000000000000000000000
--- a/xfwm4_compact/left-inactive.xpm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 1 3 1",
-" c None",
-". c #939393",
-"+ c #DEDEDE s active_color_2",
-".+"};
diff --git a/xfwm4_compact/left-inactive.xpm b/xfwm4_compact/left-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..ebcf490321b98661a3589a6087587de782a98577
--- /dev/null
+++ b/xfwm4_compact/left-inactive.xpm
@@ -0,0 +1 @@
+left-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/maximize-pressed.xpm b/xfwm4_compact/maximize-pressed.xpm
index 4af2dd5e68e06595e697b784bff153ceec1f7a5a..607d20a6a752471c22b5ec601eb0b07141edb936 100644
--- a/xfwm4_compact/maximize-pressed.xpm
+++ b/xfwm4_compact/maximize-pressed.xpm
@@ -1,12 +1,17 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"12 18 6 1",
+"12 18 11 1",
" c None",
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #9BC264",
-"$ c #F4F4F4",
+"# c #5BB551",
+"$ c #5CB553",
+"% c #65BC5C",
+"& c #7ACB71",
+"* c #F4F4F4",
+"= c #93D88C",
+"- c #9ADD93",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
@@ -14,14 +19,14 @@ static char * maximize_pressed_xpm[] = {
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@##@@@@@",
-"@@@@@##@@@@@",
-"@@@@@##@@@@@",
-"@@########@@",
-"@@########@@",
-"@@$$$##$$$@@",
-"@@@@@##@@@@@",
-"@@@@@##@@@@@",
"@@@@@$$@@@@@",
+"@@@@@%%@@@@@",
+"@@%%%%%%%%@@",
+"@@&&&&&&&&@@",
+"@@***&&***@@",
+"@@@@@==@@@@@",
+"@@@@@--@@@@@",
+"@@@@@**@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@"};
diff --git a/xfwm4_compact/menu-pressed.xpm b/xfwm4_compact/menu-pressed.xpm
index 06eb77c2337a339cc6c0b4869e8f24de099f1127..fc665445850851033953e7fd4f966edf18fe2127 100644
--- a/xfwm4_compact/menu-pressed.xpm
+++ b/xfwm4_compact/menu-pressed.xpm
@@ -1,20 +1,31 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"12 18 14 1",
+"12 18 25 1",
" c None",
". c #939393",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #B2E378",
-"$ c #9BC264",
-"% c #EBECED",
-"& c #E1E9EE",
-"* c #E8ECEF",
-"= c #D3F4AC",
-"- c #E0E8EE",
-"; c #E6E6E6",
-"> c #E2E2E2",
-", c #EDEDED",
+"# c #8BC385",
+"$ c #5CB553",
+"% c #8FC589",
+"& c #EBECED",
+"* c #81C87C",
+"= c #65BC5C",
+"- c #8DCC86",
+"; c #E4EEE2",
+"> c #7AC672",
+", c #70C367",
+"' c #84CB7D",
+") c #E9EFE9",
+"! c #D1EACE",
+"~ c #7ACB71",
+"{ c #83CD79",
+"] c #E1EEE0",
+"^ c #E6E6E6",
+"/ c #B8E3B3",
+"( c #D4EBD1",
+"_ c #E2E2E2",
+": c #EDEDED",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
@@ -23,12 +34,12 @@ static char * menu_pressed_xpm[] = {
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
-"@@#$$$$$$#@@",
-"@@%#$$$$#%@@",
-"@@@&#$$#*@@@",
-"@@@@=$$-@@@@",
-"@@@@;#=>@@@@",
-"@@@@@,;@@@@@",
+"@@#$$$$$$%@@",
+"@@&*====-&@@",
+"@@@;>,,')@@@",
+"@@@@!~{]@@@@",
+"@@@@^/(_@@@@",
+"@@@@@:^@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
diff --git a/xfwm4_compact/right-inactive.xpm b/xfwm4_compact/right-inactive.xpm
deleted file mode 100644
index 5b15e1e50298b01d7e6d382ce6fb16d824bef1a4..0000000000000000000000000000000000000000
--- a/xfwm4_compact/right-inactive.xpm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 1 3 1",
-" c None",
-". c #DEDEDE s active_color_2",
-"+ c #939393",
-".+"};
diff --git a/xfwm4_compact/right-inactive.xpm b/xfwm4_compact/right-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..6734f48a83612f12fe8f0389f9d92acba2a1e677
--- /dev/null
+++ b/xfwm4_compact/right-inactive.xpm
@@ -0,0 +1 @@
+right-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/shade-pressed.xpm b/xfwm4_compact/shade-pressed.xpm
index bda23b7508c825a6ffda0625cba2707314b029a6..605f5f17c9266d3e69bebce4655c847752f6bede 100644
--- a/xfwm4_compact/shade-pressed.xpm
+++ b/xfwm4_compact/shade-pressed.xpm
@@ -1,16 +1,24 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"12 18 10 1",
+"12 18 18 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #D3F4AC",
-"$ c #B2E378",
-"% c #C4E1A1",
-"& c #E8EBEE",
-"* c #EBECED",
-"= c #E1E8ED",
+"# c #7ACB71",
+"$ c #81CD79",
+"% c #78C670",
+"& c #70C367",
+"* c #83CA7C",
+"= c #80C77B",
+"- c #65BC5C",
+"; c #8DCC86",
+"> c #8BC385",
+", c #5CB553",
+"' c #8EC589",
+") c #E8EBEE",
+"! c #EBECED",
+"~ c #E3EDE1",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
@@ -18,11 +26,11 @@ static char * shade_pressed_xpm[] = {
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
-"@@@@@##@@@@@",
-"@@@@#$$#@@@@",
-"@@@#$%%$#@@@",
-"@@#$%&&%$#@@",
-"@@*=&@@&&*@@",
+"@@@@@#$@@@@@",
+"@@@@%&&*@@@@",
+"@@@=-;;-;@@@",
+"@@>,'))','@@",
+"@@!~)@@))!@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
diff --git a/xfwm4_compact/shade-toggled-pressed.xpm b/xfwm4_compact/shade-toggled-pressed.xpm
index 2d8483a81aac9a23bf6e7f6bf0ef1024497dd355..2190ccf587eada68f762e3aa75318f2030ca73e8 100644
--- a/xfwm4_compact/shade-toggled-pressed.xpm
+++ b/xfwm4_compact/shade-toggled-pressed.xpm
@@ -1,21 +1,32 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"12 18 15 1",
+"12 18 26 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #ACCB87",
-"$ c #C4E1A1",
-"% c #EBECED",
-"& c #E1E8ED",
-"* c #E8EBEE",
-"= c #E1E1E1",
-"- c #B2E378",
-"; c #E0E8EE",
-"> c #DFDFDF",
-", c #E5E5E5",
-"' c #ECECEC",
+"# c #8BC385",
+"$ c #5CB553",
+"% c #8EC589",
+"& c #EBECED",
+"* c #80C77B",
+"= c #65BC5C",
+"- c #8DCC86",
+"; c #E3EDE1",
+"> c #78C670",
+", c #70C367",
+"' c #83CA7C",
+") c #E8EBEE",
+"! c #E1E1E1",
+"~ c #D1EACE",
+"{ c #7ACB71",
+"] c #81CD79",
+"^ c #E1EEE0",
+"/ c #DFDFDF",
+"( c #E5E5E5",
+"_ c #B7E3B3",
+": c #D4EBD1",
+"< c #ECECEC",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
@@ -23,12 +34,12 @@ static char * shade_toggled_pressed_xpm[] = {
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
-"@@#$#@@#$#@@",
-"@@%#$##$#%@@",
-"@@@&####*@@@",
-"@@@=-$$;>@@@",
-"@@@@,#-=@@@@",
-"@@@@@',@@@@@",
+"@@#$%@@%$%@@",
+"@@&*=--=-&@@",
+"@@@;>,,')@@@",
+"@@@!~{]^/@@@",
+"@@@@(_:!@@@@",
+"@@@@@<(@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
diff --git a/xfwm4_compact/stick-pressed.xpm b/xfwm4_compact/stick-pressed.xpm
index 3d25d968a40905bcd6176690f33047c2a2718b07..1ece8f30f56fad72806cc8651b0c9e14d4ee794e 100644
--- a/xfwm4_compact/stick-pressed.xpm
+++ b/xfwm4_compact/stick-pressed.xpm
@@ -1,14 +1,27 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"12 18 8 1",
+"12 18 21 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #9BC264",
-"$ c #ECECEC",
-"% c #96BF72",
-"& c #92BC81",
+"# c #5BB551",
+"$ c #5BB652",
+"% c #5CB553",
+"& c #5CB652",
+"* c #62BB5B",
+"= c #63BC5A",
+"- c #ECECEC",
+"; c #64BB5B",
+"> c #6CC163",
+", c #75C86C",
+"' c #74C76B",
+") c #7DCE74",
+"! c #7CCD73",
+"~ c #83D37B",
+"{ c #85D37D",
+"] c #85D47C",
+"^ c #8DD985",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
@@ -16,14 +29,14 @@ static char * stick_pressed_xpm[] = {
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@####@@@@",
-"@@@######@@@",
-"@@##$$$$##@@",
-"@@##@@@@##@@",
-"@@##@@@@##@@",
-"@@##@@@@##@@",
-"@@$%&&&&&$@@",
-"@@@$####$@@@",
-"@@@@$$$$@@@@",
+"@@@$%&#$&@@@",
+"@@*=----;;@@",
+"@@>>@@@@>>@@",
+"@@,'@@@@''@@",
+"@@)!@@@@!)@@",
+"@@-~{{{]{-@@",
+"@@@-^^^^-@@@",
+"@@@@----@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@"};
diff --git a/xfwm4_compact/stick-toggled-pressed.xpm b/xfwm4_compact/stick-toggled-pressed.xpm
index 99bee04103803087be46b9bae2b00c5e41820d39..7822585e90b726103f90c7e9b8c6a744847b5e2a 100644
--- a/xfwm4_compact/stick-toggled-pressed.xpm
+++ b/xfwm4_compact/stick-toggled-pressed.xpm
@@ -1,13 +1,26 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"12 18 7 1",
+"12 18 20 1",
" c None",
". c #8D8D8D",
"+ c #FFFFFF",
"@ c #DEDEDE",
-"# c #9BC264",
-"$ c #ECECEC",
-"% c #97C073",
+"# c #5BB551",
+"$ c #5BB652",
+"% c #5CB553",
+"& c #5CB652",
+"* c #62BB5B",
+"= c #63BC5A",
+"- c #ECECEC",
+"; c #6CC163",
+"> c #75C86C",
+", c #74C76B",
+"' c #7DCE74",
+") c #7CCD73",
+"! c #83D37B",
+"~ c #85D37D",
+"{ c #85D47C",
+"] c #8DD985",
"............",
"++++++++++++",
"@@@@@@@@@@@@",
@@ -15,14 +28,14 @@ static char * stick_toggled_pressed_xpm[] = {
"@@@@@@@@@@@@",
"@@@@@@@@#@@@",
"@@@@##@@##@@",
-"@@@###@####@",
-"@@##$$@##$$@",
-"@@##@@#$$@@@",
-"@@##@@$@##@@",
-"@@##@@@@##@@",
-"@@$######$@@",
-"@@@$%%%%$@@@",
-"@@@@$$$$@@@@",
+"@@@$%&@$$$$@",
+"@@*=--@==--@",
+"@@;;@@;--@@@",
+"@@>,@@-@,,@@",
+"@@')@@@@)'@@",
+"@@-!~~~{~-@@",
+"@@@-]]]]-@@@",
+"@@@@----@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@",
"@@@@@@@@@@@@"};
diff --git a/xfwm4_compact/themerc b/xfwm4_compact/themerc
index c82ed2094770a6c4ff8589b47458be0c4b4a62dd..afdd6ec7af14027be28fd4d193b5119d1e6c5b11 100644
--- a/xfwm4_compact/themerc
+++ b/xfwm4_compact/themerc
@@ -1,7 +1,6 @@
-# Author: Philip Müller <philm@manjaro.org>
-# Author of original greybird theme: Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
+# Author: Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
# Author of original metacity theme: elementart Art Team
-# Compact Greenbird theme for xfwm4 using GTK color pickup.
+# Compact Greybird theme for xfwm4 using GTK color pickup.
# License: GPL
# Date: July 2011
diff --git a/xfwm4_compact/title-2-active.png b/xfwm4_compact/title-2-active.png
deleted file mode 100644
index eb2d7a72d0e144417a0709a4e4aeaa478f291614..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-2-active.png and /dev/null differ
diff --git a/xfwm4_compact/title-2-active.png b/xfwm4_compact/title-2-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4_compact/title-2-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-2-active.xpm b/xfwm4_compact/title-2-active.xpm
deleted file mode 100644
index 518d57282d628291977366ac7b9122275dd69920..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-2-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-2-active.xpm b/xfwm4_compact/title-2-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4_compact/title-2-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-2-inactive.png b/xfwm4_compact/title-2-inactive.png
deleted file mode 100644
index c46922400f288f508ac7d05b228e0340586629df..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-2-inactive.png and /dev/null differ
diff --git a/xfwm4_compact/title-2-inactive.png b/xfwm4_compact/title-2-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4_compact/title-2-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-2-inactive.xpm b/xfwm4_compact/title-2-inactive.xpm
deleted file mode 100644
index 0990ef808b546de5e033b3c137be09025048c50c..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-2-inactive.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-2-inactive.xpm b/xfwm4_compact/title-2-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4_compact/title-2-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-3-active.png b/xfwm4_compact/title-3-active.png
deleted file mode 100644
index eb2d7a72d0e144417a0709a4e4aeaa478f291614..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-3-active.png and /dev/null differ
diff --git a/xfwm4_compact/title-3-active.png b/xfwm4_compact/title-3-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4_compact/title-3-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-3-active.xpm b/xfwm4_compact/title-3-active.xpm
deleted file mode 100644
index 518d57282d628291977366ac7b9122275dd69920..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-3-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-3-active.xpm b/xfwm4_compact/title-3-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4_compact/title-3-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-3-inactive.png b/xfwm4_compact/title-3-inactive.png
deleted file mode 100644
index c46922400f288f508ac7d05b228e0340586629df..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-3-inactive.png and /dev/null differ
diff --git a/xfwm4_compact/title-3-inactive.png b/xfwm4_compact/title-3-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4_compact/title-3-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-3-inactive.xpm b/xfwm4_compact/title-3-inactive.xpm
deleted file mode 100644
index 0990ef808b546de5e033b3c137be09025048c50c..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-3-inactive.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-3-inactive.xpm b/xfwm4_compact/title-3-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4_compact/title-3-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-4-active.png b/xfwm4_compact/title-4-active.png
deleted file mode 100644
index eb2d7a72d0e144417a0709a4e4aeaa478f291614..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-4-active.png and /dev/null differ
diff --git a/xfwm4_compact/title-4-active.png b/xfwm4_compact/title-4-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4_compact/title-4-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-4-active.xpm b/xfwm4_compact/title-4-active.xpm
deleted file mode 100644
index 518d57282d628291977366ac7b9122275dd69920..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-4-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-4-active.xpm b/xfwm4_compact/title-4-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4_compact/title-4-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-4-inactive.png b/xfwm4_compact/title-4-inactive.png
deleted file mode 100644
index c46922400f288f508ac7d05b228e0340586629df..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-4-inactive.png and /dev/null differ
diff --git a/xfwm4_compact/title-4-inactive.png b/xfwm4_compact/title-4-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4_compact/title-4-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-4-inactive.xpm b/xfwm4_compact/title-4-inactive.xpm
deleted file mode 100644
index 0990ef808b546de5e033b3c137be09025048c50c..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-4-inactive.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-4-inactive.xpm b/xfwm4_compact/title-4-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4_compact/title-4-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-5-active.png b/xfwm4_compact/title-5-active.png
deleted file mode 100644
index eb2d7a72d0e144417a0709a4e4aeaa478f291614..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-5-active.png and /dev/null differ
diff --git a/xfwm4_compact/title-5-active.png b/xfwm4_compact/title-5-active.png
new file mode 120000
index 0000000000000000000000000000000000000000..b4aa42bcd06970e32bc4377f390ebc0396a35090
--- /dev/null
+++ b/xfwm4_compact/title-5-active.png
@@ -0,0 +1 @@
+title-1-active.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-5-active.xpm b/xfwm4_compact/title-5-active.xpm
deleted file mode 100644
index 518d57282d628291977366ac7b9122275dd69920..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-5-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-5-active.xpm b/xfwm4_compact/title-5-active.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..def55f78ed49440b00c26161fe097b3b6c2b9114
--- /dev/null
+++ b/xfwm4_compact/title-5-active.xpm
@@ -0,0 +1 @@
+title-1-active.xpm
\ No newline at end of file
diff --git a/xfwm4_compact/title-5-inactive.png b/xfwm4_compact/title-5-inactive.png
deleted file mode 100644
index c46922400f288f508ac7d05b228e0340586629df..0000000000000000000000000000000000000000
Binary files a/xfwm4_compact/title-5-inactive.png and /dev/null differ
diff --git a/xfwm4_compact/title-5-inactive.png b/xfwm4_compact/title-5-inactive.png
new file mode 120000
index 0000000000000000000000000000000000000000..6cd87130e3c15c169dd6f1685c2f8467ff01e248
--- /dev/null
+++ b/xfwm4_compact/title-5-inactive.png
@@ -0,0 +1 @@
+title-1-inactive.png
\ No newline at end of file
diff --git a/xfwm4_compact/title-5-inactive.xpm b/xfwm4_compact/title-5-inactive.xpm
deleted file mode 100644
index 0990ef808b546de5e033b3c137be09025048c50c..0000000000000000000000000000000000000000
--- a/xfwm4_compact/title-5-inactive.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 18 4 1",
-" c None",
-". c #939393",
-"+ c #FFFFFF",
-"@ c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/xfwm4_compact/title-5-inactive.xpm b/xfwm4_compact/title-5-inactive.xpm
new file mode 120000
index 0000000000000000000000000000000000000000..b5c58ae0c3f4744d820e73031bde95b4801516ba
--- /dev/null
+++ b/xfwm4_compact/title-5-inactive.xpm
@@ -0,0 +1 @@
+title-1-inactive.xpm
\ No newline at end of file