From 079aef0b8d938e4ac2579ae4f55672107586658b Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Tue, 15 Jan 2019 22:07:55 +0100 Subject: [PATCH] Adwaita: expand the headerbar button styling - it's not just stackswitcher buttons, apparently. Builder uses togglebuttons. --- gtk/theme/Adwaita/_common.scss | 3 ++- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 5bc8432d41..b76591d51a 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1669,7 +1669,8 @@ headerbar { } } - stackswitcher button:checked { + stackswitcher button:checked, + button.toggle:checked { /* darken switchbuttons for headerbars. issue #1588 */ background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%))); border-top-color: darken($borders_color, 7%); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 64b60c5940..3d50e19251 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -664,7 +664,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } -.titlebar:not(headerbar) stackswitcher button:checked, headerbar stackswitcher button:checked { /* darken switchbuttons for headerbars. issue #1588 */ background: image(#282828); border-top-color: #141314; } +.titlebar:not(headerbar) stackswitcher button:checked, .titlebar:not(headerbar) button.toggle:checked, headerbar stackswitcher button:checked, headerbar button.toggle:checked { /* darken switchbuttons for headerbars. issue #1588 */ background: image(#282828); border-top-color: #141314; } .titlebar:not(headerbar) separator.titlebutton, headerbar separator.titlebutton { opacity: 0; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 5ac5ba5555..11ae36172f 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -672,7 +672,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } -.titlebar:not(headerbar) stackswitcher button:checked, headerbar stackswitcher button:checked { /* darken switchbuttons for headerbars. issue #1588 */ background: image(#cfcac4); border-top-color: #bdb5ae; } +.titlebar:not(headerbar) stackswitcher button:checked, .titlebar:not(headerbar) button.toggle:checked, headerbar stackswitcher button:checked, headerbar button.toggle:checked { /* darken switchbuttons for headerbars. issue #1588 */ background: image(#cfcac4); border-top-color: #bdb5ae; } .titlebar:not(headerbar) separator.titlebutton, headerbar separator.titlebutton { opacity: 0; }