summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLapo Calamandrei <calamandrei@gmail.com>2014-06-27 16:23:12 +0200
committerLapo Calamandrei <calamandrei@gmail.com>2014-06-27 16:24:24 +0200
commit8231a3c7b9b8b727946335ed590f767cb463a19b (patch)
tree0d71f7dd1bf2df61067d30d0e6baa7bd5fcb4437
parent796dc682bcc60e8756009b59466e176c71099f75 (diff)
downloadgtk+-8231a3c7b9b8b727946335ed590f767cb463a19b.tar.gz
Adwaita: export the right color for the wm hilight dark var
-rw-r--r--gtk/resources/theme/Adwaita/_colors.scss7
-rw-r--r--gtk/resources/theme/Adwaita/gtk-contained-dark.css2
2 files changed, 7 insertions, 2 deletions
diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index 2541103ff0..3391c71069 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -59,9 +59,14 @@ $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
//@define-color desctructive_color $destructive_color
//WM
+
+$_wm_highlight: if($variant=='light', $borders_edge, // Sass gets mad if this is
+ transparentize(black,1)); // done directly in the
+ // color definition
+
@define-color wm_title shade($fg_color, 1.8);
@define-color wm_unfocused_title $backdrop_fg_color;
-@define-color wm_highlight $borders_edge;
+@define-color wm_highlight $_wm_highlight;
@define-color wm_borders_edge $borders_edge;
@define-color wm_bg_a shade($bg_color, 1.2);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 62ccb6f5d5..92c88bb081 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -19,7 +19,7 @@
@define-color success_color #5aa411;
@define-color wm_title shade(#eeeeec, 1.8);
@define-color wm_unfocused_title #c9cbc9;
-@define-color wm_highlight rgba(238, 238, 236, 0.1);
+@define-color wm_highlight transparent;
@define-color wm_borders_edge rgba(238, 238, 236, 0.1);
@define-color wm_bg_a shade(#393f3f, 1.2);
@define-color wm_bg_b #393f3f;