[gtk/gtk-3-24] Adwaita: flatten the headerbar again

[Jakub Steiner <jimmac src gnome org>]

commit a386bc98d7200a252fb23039839b790a68c73481
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed Nov 28 20:27:44 2018 +0100

    Adwaita: flatten the headerbar again

 gtk/theme/Adwaita/_drawing.scss          | 4 ++--
 gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
 gtk/theme/Adwaita/gtk-contained.css      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 3acabc9e19..1fad97a10e 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -499,9 +499,9 @@
 // $hc: top highlight color
 // $ov: a background layer for background shorthand (hence no commas!)
 //
-  $gradient: linear-gradient(to top, darken($c, 3%) 3px, lighten($c, 6%));
+  $gradient: linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
 
-  @if $variant == 'dark' { $gradient: linear-gradient(to top, $c 3px, lighten($c, 3%)); }
+  @if $variant == 'dark' { $gradient: linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%)); }
 
   @if $ov != none { background: $c $ov, $gradient; }
   @else { background: $c $gradient; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3f19f2d343..519ba17025 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -592,7 +592,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 .inline-toolbar:backdrop, searchbar > revealer > box:backdrop, .location-bar:backdrop { border-color: 
#2a2a2b; background-color: #383738; box-shadow: none; transition: 200ms ease-out; }
 
 /*************** Header bars * */
-.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: 
solid; border-color: #111111; border-radius: 0; background: #252526 linear-gradient(to top, #252526 3px, 
#2d2d2e); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
+.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: 
solid; border-color: #111111; border-radius: 0; background: #252526 linear-gradient(to top, #2d2d2e 3px, 
#323233); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
 
 .titlebar:backdrop:not(headerbar), headerbar:backdrop { border-color: #2a2a2b; background-color: #3f3e40; 
background-image: none; box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); transition: 200ms ease-out; }
 
@@ -600,7 +600,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; padding-left: 12px; 
padding-right: 12px; }
 
-.selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode 
headerbar, headerbar.selection-mode { color: #ffffff; border-color: #092444; text-shadow: 0 -1px rgba(0, 0, 
0, 0.5); background: #15539e linear-gradient(to top, #15539e 3px, #175aab); box-shadow: inset 0 1px rgba(29, 
88, 161, 0.535); }
+.selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode 
headerbar, headerbar.selection-mode { color: #ffffff; border-color: #092444; text-shadow: 0 -1px rgba(0, 0, 
0, 0.5); background: #15539e linear-gradient(to top, #175aab 3px, #185fb4); box-shadow: inset 0 1px rgba(29, 
88, 161, 0.535); }
 
 .selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar), 
.selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #15539e; 
background-image: none; box-shadow: inset 0 1px rgba(32, 91, 162, 0.442); }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 61c108f37a..1162c16de6 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -600,7 +600,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 .inline-toolbar:backdrop, searchbar > revealer > box:backdrop, .location-bar:backdrop { border-color: 
#dcd8d5; background-color: #edebe9; box-shadow: none; transition: 200ms ease-out; }
 
 /*************** Header bars * */
-.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: 
solid; border-color: #bfb8b1; border-radius: 0; background: #dfdcd8 linear-gradient(to top, #d8d4d0 3px, 
#edebe9); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
+.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: 
solid; border-color: #bfb8b1; border-radius: 0; background: #dfdcd8 linear-gradient(to top, #d8d4d0, #dfdcd8 
3px, #edebe9); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
 
 .titlebar:backdrop:not(headerbar), headerbar:backdrop { border-color: #dcd8d5; background-color: #f6f5f4; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); transition: 200ms ease-out; }
 
@@ -608,7 +608,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; padding-left: 12px; 
padding-right: 12px; }
 
-.selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode 
headerbar, headerbar.selection-mode { color: #ffffff; border-color: #0f3b71; text-shadow: 0 -1px rgba(0, 0, 
0, 0.5); background: #3584e4 linear-gradient(to top, #287ce2 3px, #5094e8); box-shadow: inset 0 1px rgba(134, 
181, 239, 0.9); }
+.selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode 
headerbar, headerbar.selection-mode { color: #ffffff; border-color: #0f3b71; text-shadow: 0 -1px rgba(0, 0, 
0, 0.5); background: #3584e4 linear-gradient(to top, #287ce2, #3584e4 3px, #5094e8); box-shadow: inset 0 1px 
rgba(134, 181, 239, 0.9); }
 
 .selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar), 
.selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #3584e4; 
background-image: none; box-shadow: inset 0 1px rgba(154, 194, 242, 0.88); }