[gtk/gtk-3-24] Adwaita: active state for dark buttons

[Jakub Steiner <jimmac src gnome org>]

commit 8e3541b28f76aa48f8b5407195a2b4e365f99124
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu Nov 29 20:21:58 2018 +0100

    Adwaita: active state for dark buttons
    
    - was a bit too light. Tricky to tell which is pushed when
      you have two stackswitcher buttons.

 gtk/theme/Adwaita/_drawing.scss          |  2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 6441c977b9..4a7a89c837 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -278,7 +278,7 @@
     color: $tc;
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c), $borders_color);
-    $button_fill: if($variant == 'light', image(darken($c, 12%)), image(darken($c, 6%))) !global;
+    $button_fill: if($variant == 'light', image(darken($c, 12%)), image(darken($c, 9%))) !global;
     background-image: $button_fill;
     @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0f2775baaf..362475b989 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -198,7 +198,7 @@ notebook > header > tabs > arrow:hover:active, button.sidebar-button:hover:activ
 
 notebook > header > tabs > arrow:hover, button.titlebutton:hover, button:hover { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; border-bottom-color: #111111; text-shadow: 0 
-1px rgba(0, 0, 0, 0.754353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.754353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.05); background-image: linear-gradient(to top, #3a393b 2px, #3c3c3d, #414142 1px); 
-gtk-icon-effect: highlight; }
 
-notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > 
arrow:checked, button.titlebutton:checked, button:active, button:checked { color: #eeeeec; outline-color: 
rgba(238, 238, 236, 0.3); border-color: #252526; background-image: image(#302f30); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }
+notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > 
arrow:checked, button.titlebutton:checked, button:active, button:checked { color: #eeeeec; outline-color: 
rgba(238, 238, 236, 0.3); border-color: #252526; background-image: image(#282828); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }
 
 notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, 
notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop 
{ border-color: #2a2a2b; background-image: image(#3f3e40); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
 
@@ -278,7 +278,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);
 
 button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#092444; border-bottom-color: #030c17; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: 
linear-gradient(to top, #144e95 2px, #155099, #1655a2 1px); }
 
-button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #092444; background-image: image(#114583); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #092444; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 .selection-mode button.titlebutton:backdrop, button.suggested-action:backdrop, 
button.suggested-action.flat:backdrop { border-color: #092444; background-image: image(#15539e); text-shadow: 
none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
@@ -322,7 +322,7 @@ button.destructive-action.flat { border-color: transparent; background-color: tr
 
 button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#570b0e; border-bottom-color: #2a0507; text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: 
linear-gradient(to top, #a9141b 2px, #ae151c, #b7161d 1px); }
 
-button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #570b0e; background-image: image(#971218); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #570b0e; background-image: image(#8a1116); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 button.destructive-action:backdrop, button.destructive-action.flat:backdrop { border-color: #570b0e; 
background-image: image(#b2161d); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); }
 
@@ -398,7 +398,7 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
 
 .inline-toolbar toolbutton > button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #252526; border-bottom-color: #111111; text-shadow: 0 -1px rgba(0, 0, 0, 0.754353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.754353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); 
background-image: linear-gradient(to top, #3a393b 2px, #3c3c3d, #414142 1px); }
 
-.inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; background-image: image(#302f30); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+.inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; background-image: image(#282828); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 .inline-toolbar toolbutton > button:disabled { border-color: #252526; background-image: image(#353338); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
@@ -610,7 +610,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #092444; border-bottom-color: #030c17; text-shadow: 0 
-1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.05); background-image: linear-gradient(to top, #144e95 2px, #155099, #1655a2 1px); }
 
-.selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) 
button:checked, .selection-mode.titlebar:not(headerbar) button:active, 
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, 
.selection-mode headerbar button:checked, headerbar.selection-mode button:active, headerbar.selection-mode 
button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #092444; 
background-image: image(#114583); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
+.selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) 
button:checked, .selection-mode.titlebar:not(headerbar) button:active, 
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, 
.selection-mode headerbar button:checked, headerbar.selection-mode button:active, headerbar.selection-mode 
button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #092444; 
background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
 .selection-mode .titlebar:not(headerbar) button:backdrop.flat, .selection-mode .titlebar:not(headerbar) 
button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, 
.selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode headerbar button:backdrop.flat, 
.selection-mode headerbar button:backdrop, headerbar.selection-mode button:backdrop.flat, 
headerbar.selection-mode button:backdrop { border-color: #092444; background-image: image(#15539e); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: 
none; border-color: #092444; }
 
@@ -642,7 +642,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; border-bottom-color: #111111; text-shadow: 0 
-1px rgba(0, 0, 0, 0.754353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.754353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.05); background-image: linear-gradient(to top, #3a393b 2px, #3c3c3d, #414142 1px); 
border-color: #092444; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:active, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar 
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; background-image: image(#302f30); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #092444; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:active, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar 
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; background-image: image(#282828); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #092444; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar 
button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { border-color: 
#252526; background-image: image(#353338); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); border-color: #092444; }
 
@@ -1132,7 +1132,7 @@ popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px;
 
 check:hover, radio:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #111111; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #373738, inset 0 -1px #302f30, 0 1px rgba(0, 
0, 0, 0.1); background-image: linear-gradient(to bottom, #3f3e40 20%, #353435 90%); }
 
-check:active, radio:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; 
background-image: image(#302f30); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
+check:active, radio:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; 
background-image: image(#282828); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
 check:disabled, radio:disabled { border-color: #252526; background-image: image(#353338); text-shadow: none; 
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
@@ -1756,7 +1756,7 @@ infobar.info button, infobar.question button, infobar.warning button, infobar.er
 
 infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #092444; 
border-bottom-color: #030c17; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 
0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: linear-gradient(to top, 
#144e95 2px, #155099, #1655a2 1px); }
 
-infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question 
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, 
infobar.error button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#092444; background-image: image(#114583); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
+infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question 
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, 
infobar.error button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#092444; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
 infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, 
infobar.error button:disabled { border-color: #092444; background-image: image(#184c8d); text-shadow: none; 
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }