[gnome-shell/wip/jimmac/osd-sync-with-gtk] theme: sync OSD colors with gtk

[Jakub Steiner <jimmac src gnome org>]

commit 6393e90a5a04a673942265d3e5a998d1ad04f0c1
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue Apr 16 16:47:59 2019 +0200

    theme: sync OSD colors with gtk

 data/theme/gnome-shell-sass/_colors.scss  |  2 +-
 data/theme/gnome-shell-sass/_common.scss  |  4 ++--
 data/theme/gnome-shell-sass/_drawing.scss | 11 ++++-------
 3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 0a851f3a4..fb2f39e01 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -21,7 +21,7 @@ $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
 
 $osd_fg_color: #eeeeec;
-$osd_bg_color: #2e3436;
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 15%),0.3);
 $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 835d44b55..59b69c753 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -29,7 +29,7 @@ $panel-corner-radius: 6px;
 /* GLOBALS */
 $font-size: 11;
 $font-family: Cantarell, Sans-Serif;
-$_bubble_bg_color: opacify($osd_bg_color,0.25);
+$_bubble_bg_color: $osd_bg_color;
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
 
@@ -184,7 +184,7 @@ StScrollBar {
 .modal-dialog {
   border-radius: 9px;
   color: $osd_fg_color;
-  background-color: transparentize(darken($osd_bg_color,10%),0.05);
+  background-color: $osd_bg_color;
   border: 1px solid $_bubble_borders_color;
   .modal-dialog-content-box {
     padding: 24px;
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 7ac18b1bb..106a20ad7 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -111,7 +111,7 @@
   }
 }
 
-@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
+@mixin button($t, $c:opacify(lighten($osd_bg_color, 5%),1.0), $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -136,8 +136,7 @@
   //
   // normal button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
-                            $osd_bg_color);
+    $_bg: $c;
 
     color: $osd_fg_color;
     background-color: $_bg;
@@ -150,8 +149,7 @@
   //
   // focused button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-                          lighten($osd_bg_color,3%));
+    $_bg: lighten($c,3%);
 
     color: $osd_fg_color;
     text-shadow: 0 1px black;
@@ -163,8 +161,7 @@
   //
   // active osd button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-                            lighten($osd_bg_color,3%));
+    $_bg: lighten($c,3%);
 
     color: white;
     border-color: $osd_borders_color;