From 49ba969813649c19f767ad6d22f350a173ddb9df Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Wed, 31 May 2017 17:37:43 -0400 Subject: BlackMATE fixes for CSD apps Also fix window buttons in metacity, mutter, gnome-shell --- desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 73 +++++++++++++--------- .../BlackMATE/gtk-3.0/window-controls.css | 27 +++++++- 2 files changed, 70 insertions(+), 30 deletions(-) diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css index 9568dfef..1d16371f 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css @@ -2946,7 +2946,6 @@ headerbar, border-style: solid; padding: 0 1px; border-radius: 7px 7px 0 0; - padding: 6px; background-color: @theme_bg_color; border-color: shade(@theme_bg_color, 0.8); text-shadow: none; @@ -2991,29 +2990,41 @@ dialog.background.solid-csd > headerbar.titlebar { * did not set a custom titlebar. */ .titlebar.default-decoration { - border: none; - box-shadow: none; + border: none; + box-shadow: none; } .titlebar .title, headerbar .title { - font-weight: bold; - font-size: 120%; - background: none; - color: #D9D9D9; + font-weight: bold; + font-size: 120%; + background: none; + color: #D9D9D9; +} + +/*This does not respond to .titlebar or headerbar */ +/*So we are forced to rely on nothing else being called label.title */ +box.vertical>label.title{ + padding: 0px; +} + +.titlebar separator, +headerbar separator { + background-color: transparent; + background-image: none; } +headerbar:backdrop, .titlebar:backdrop { color: #747473; text-shadow: none; background-image: none; - background-color: #747473; + background-color: #606060; } .titlebar .titlebutton, headerbar.titlebar button.image-button.titlebutton, button.text-button.titlebutton { - padding: 4px 4px 4px 4px; border-radius: 3px; border-width: 1px; border-style: solid; @@ -3024,6 +3035,24 @@ button.text-button.titlebutton { @button_hover_gradient_color_b); } +headerbar:backdrop button, +.titlebar:backdrop button { + background-image: linear-gradient(to bottom, + alpha(@button_hover_gradient_color_a, 0.3), + alpha(@button_hover_gradient_color_b, 0.3)); + background-color:transparent; +} + +headerbar button:not(.appmenu):not(.titlebutton){ + padding: 4px; +} + +/*Keep the size of decorations down in ssd apps on Metacity/Mutter/Gnome-shell etc*/ +headerbar button.appmenu, .csd button.titlebutton{ + padding: 0px 4px; + margin: 0px; +} + .titlebar .titlebutton { /* fake request for hardcoded icons, to avoid usage of regular window-close button*/ @@ -3032,7 +3061,6 @@ button.text-button.titlebutton { border-style: none; border-image-source: none; background-image: none; - padding: 4px 0px 4px 0px; } .titlebar .titlebutton:hover, @@ -3083,6 +3111,11 @@ button.text-button.titlebutton:checked { .titlebar .left .titlebutton:first-child { } +.titlebar .titlebutton:hover:backdrop, +headerbar.titlebar button.image-button.titlebutton:hover:backdrop { + color: #747473; +} + .titlebar .titlebutton:backdrop, .titlebar .titlebutton:hover:backdrop, headerbar.titlebar button.image-button.titlebutton:backdrop, @@ -3093,37 +3126,19 @@ headerbar.titlebar button.image-button.titlebutton:hover:backdrop { -gtk-icon-shadow: none; } -.titlebar .titlebutton:hover:backdrop, -headerbar.titlebar button.image-button.titlebutton:hover:backdrop { - color: #747473; -} - -headerbar button.text-button, -.titlebar button.text-button { - padding: 2px 16px; -} - -headerbar button.image-button, -.titlebar button.image-button { - padding: 5px 4px 4px 5px; -} - - .background.csd decoration { border-radius: 7px 7px 0px 0px; border-width: 0px; box-shadow: 0 0 0 2px @wm_csd_border_color, 0 2px 8px 3px @wm_shadow; /* this is used for the resize cursor area */ - margin: 10px; + margin: 10px; } .background.csd decoration:backdrop { background: @theme_bg_color; border-style: solid; border-radius: 7px 7px 0px 0px; - border-width: 1px; border-color: #595959; - padding: 0px; } .background.ssd decoration { diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css index 1b911533..75d84d41 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css +++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css @@ -1,3 +1,11 @@ +/*left & right not set for ssd by metacity,mutter, g-s, include this case*/ +headerbar button.minimize.titlebutton, +headerbar button.maximize.titlebutton, +headerbar button.close.titlebutton, +headerbar button.minimize.titlebutton:backdrop, +headerbar button.maximize.titlebutton:backdrop, +headerbar button.close.titlebutton:backdrop, +/*other WMs*/ headerbar .right button.minimize.titlebutton, headerbar .right:dir(rtl) button.minimize.titlebutton, headerbar .left button.minimize.titlebutton, @@ -24,6 +32,7 @@ headerbar .left:dir(rtl) button.close.titlebutton { /* minimize */ +headerbar button.minimize.titlebutton, headerbar .right button.minimize.titlebutton, headerbar .right:dir(rtl) button.minimize.titlebutton, headerbar .left button.minimize.titlebutton, @@ -31,6 +40,7 @@ headerbar .left:dir(rtl) button.minimize.titlebutton { background-image: url('window-controls/neutral.png'); } +headerbar button.minimize.titlebutton:hover, headerbar .right button.minimize.titlebutton:hover, headerbar .right:dir(rtl) button.minimize.titlebutton:hover, headerbar .left button.minimize.titlebutton:hover, @@ -38,6 +48,7 @@ headerbar .left:dir(rtl) button.minimize.titlebutton:hover { background-image: url('window-controls/button-min-focus.png'); } +headerbar button.minimize.titlebutton:active, headerbar .right button.minimize.titlebutton:active, headerbar .right:dir(rtl) button.minimize.titlebutton:active, headerbar .left button.minimize.titlebutton:active, @@ -49,13 +60,15 @@ headerbar .left:dir(rtl) button.minimize.titlebutton:checked { background-image: url('window-controls/neutral.png'); } +headerbar button.minimize.titlebutton:backdrop, headerbar .right button.minimize.titlebutton:backdrop, headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop, headerbar .left button.minimize.titlebutton:backdrop, headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop { - background-image: url('window-controls/unfocused.png'); + background-image: url('window-controls/unfocus.png'); } /* +headerbar button.minimize.titlebutton:backdrop:hover, headerbar .right button.minimize.titlebutton:backdrop:hover, headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover, headerbar .left button.minimize.titlebutton:backdrop:hover, @@ -64,6 +77,7 @@ headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover { } */ /* maximize */ +headerbar button.maximize.titlebutton, headerbar .right button.maximize.titlebutton, headerbar .right:dir(rtl) button.maximize.titlebutton, headerbar .left button.maximize.titlebutton, @@ -71,6 +85,7 @@ headerbar .left:dir(rtl) button.maximize.titlebutton { background-image: url('window-controls/neutral.png'); } +headerbar button.maximize.titlebutton:hover, headerbar .right button.maximize.titlebutton:hover, headerbar .right:dir(rtl) button.maximize.titlebutton:hover, headerbar .left button.maximize.titlebutton:hover, @@ -78,6 +93,7 @@ headerbar .left:dir(rtl) button.maximize.titlebutton:hover { background-image: url('window-controls/button-max-focus.png'); } +headerbar button.maximize.titlebutton:active, headerbar .right button.maximize.titlebutton:active, headerbar .right:dir(rtl) button.maximize.titlebutton:active, headerbar .left button.maximize.titlebutton:active, @@ -89,6 +105,7 @@ headerbar .left:dir(rtl) button.maximize.titlebutton:checked { background-image: url('window-controls/neutral.png'); } +headerbar button.maximize.titlebutton:backdrop, headerbar .right button.maximize.titlebutton:backdrop, headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop, headerbar .left button.maximize.titlebutton:backdrop, @@ -96,6 +113,7 @@ headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop { background-image: url('window-controls/unfocus.png'); } /* +headerbar button.maximize.titlebutton:backdrop:hover, headerbar .right button.maximize.titlebutton:backdrop:hover, headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover, headerbar .left button.maximize.titlebutton:backdrop:hover, @@ -104,6 +122,9 @@ headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover { } */ /* close */ + + +headerbar button.close.titlebutton, /*Include Metacity/Mutter/G-S close button */ headerbar .right button.close.titlebutton, headerbar .right:dir(rtl) button.close.titlebutton, headerbar .left button.close.titlebutton, @@ -112,6 +133,7 @@ headerbar .left:dir(rtl) button.close.titlebutton { /*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */ } +headerbar button.close.titlebutton:hover, headerbar .right button.close.titlebutton:hover, headerbar .right:dir(rtl) button.close.titlebutton:hover, headerbar .left button.close.titlebutton:hover, @@ -119,6 +141,7 @@ headerbar .left:dir(rtl) button.close.titlebutton:hover { background-image: url('window-controls/button-close-focus.png'); } +headerbar button.close.titlebutton:active, headerbar .right button.close.titlebutton:active, headerbar .right:dir(rtl) button.close.titlebutton:active, headerbar .left button.close.titlebutton:active, @@ -130,6 +153,7 @@ headerbar .left:dir(rtl) button.close.titlebutton:checked { background-image: url('window-controls/neutral.png'); } +headerbar button.close.titlebutton:backdrop, headerbar .right button.close.titlebutton:backdrop, headerbar .right:dir(rtl) button.close.titlebutton:backdrop, headerbar .left button.close.titlebutton:backdrop, @@ -137,6 +161,7 @@ headerbar .left:dir(rtl) button.close.titlebutton:backdrop { background-image: url('window-controls/unfocus.png'); } /* +headerbar button.close.titlebutton:backdrop:hover, headerbar .right button.close.titlebutton:backdrop:hover, headerbar .right:dir(rtl) button.close.titlebutton:backdrop:hover, headerbar .left button.close.titlebutton:backdrop:hover, -- cgit v1.2.1