fix buttons in dark metacity theme

6 files changed, 128 insertions, 0 deletions

diff --git a/common/gtk-3.0/3.14/_colors-public.scss b/common/gtk-3.0/3.14/_colors-public.scss
index d5919aa..0590a00 100644
--- a/common/gtk-3.0/3.14/_colors-public.scss
+++ b/common/gtk-3.0/3.14/_colors-public.scss
@@ -43,6 +43,34 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 @define-color wm_highlight #{"" + $wm_highlight};
 @define-color wm_shadow alpha(black, 0.35);
 
+//WM Buttons
+
+// Close
+@define-color wm_button_close_bg #{"" + $wm_button_close_bg};
+@define-color wm_button_close_hover_bg #{"" + $wm_button_close_hover_bg};
+@define-color wm_button_close_active_bg #{"" + $wm_button_close_active_bg};
+
+@define-color wm_icon_close_bg #{"" + $wm_icon_close_bg};
+@define-color wm_icon_close_hover_bg #{"" + $wm_icon_close_hover_bg};
+@define-color wm_icon_close_active_bg #{"" + $wm_icon_close_active_bg};
+
+// Minimize, Maximize
+@define-color wm_button_bg #{"" + $wm_button_bg};
+@define-color wm_button_unfocused_bg #{"" + $wm_button_unfocused_bg};
+@define-color wm_button_hover_bg #{"" + $wm_button_hover_bg};
+@define-color wm_button_active_bg #{"" + $wm_button_active_bg};
+
+@define-color wm_button_border #{"" + $wm_button_border};
+@define-color wm_button_unfocused_border #{"" + $wm_button_unfocused_border};
+@define-color wm_button_hover_border #{"" + $wm_button_hover_border};
+@define-color wm_button_active_border #{"" + $wm_button_active_border};
+
+@define-color wm_icon_bg #{"" + $wm_icon_bg};
+@define-color wm_icon_unfocused_bg #{"" + $wm_icon_unfocused_bg};
+@define-color wm_icon_hover_bg #{"" + $wm_icon_hover_bg};
+@define-color wm_icon_active_bg #{"" + $wm_icon_active_bg};
+
+
 //FIXME this is really an API
 
 @define-color content_view_bg #{"" + $base_color};
diff --git a/common/gtk-3.0/3.14/_colors.scss b/common/gtk-3.0/3.14/_colors.scss
index 2300247..a3ddc53 100644
--- a/common/gtk-3.0/3.14/_colors.scss
+++ b/common/gtk-3.0/3.14/_colors.scss
@@ -64,3 +64,31 @@ $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sid
 
 $panel_bg: darken($osd_bg_color, 10%);
 $panel_fg: $dark_sidebar_fg;
+
+
+//WM Buttons
+
+// Close
+$wm_button_close_bg: if($variant == 'light', #f37076, #e45e65);
+$wm_button_close_hover_bg: if($variant == 'light', #f79da1, #f48085);
+$wm_button_close_active_bg: if($variant == 'light', #ef4048, #e6262f);
+
+$wm_icon_close_bg: $selected_fg_color;
+$wm_icon_close_hover_bg: $selected_fg_color;
+$wm_icon_close_active_bg: $selected_fg_color;
+
+// Minimize, Maximize
+$wm_button_bg: if($variant == 'light', #fdfdfd, #212429);
+$wm_button_unfocused_bg: if($variant == 'light', #f6f7f8, #22252b);
+$wm_button_hover_bg: if($variant == 'light', #fdfdfd, #212429);
+$wm_button_active_bg: $selected_bg_color;
+
+$wm_button_border: if($variant == 'light', #d8dae0, #141619);
+$wm_button_unfocused_border: if($variant == 'light', #dddee2, #1a1c20);
+$wm_button_hover_border: $selected_bg_color;
+$wm_button_active_border: $selected_bg_color;
+
+$wm_icon_bg: if($variant == 'light', #a7adb9, #777d86);
+$wm_icon_unfocused_bg: if($variant == 'light', #babec7, #575c63);
+$wm_icon_hover_bg: if($variant == 'light', #757d91, #838993);
+$wm_icon_active_bg: $selected_fg_color;
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 4572748..514eda1 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -3377,4 +3377,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #282c32;
 @define-color wm_highlight #2c2f36;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #e45e65;
+@define-color wm_button_close_hover_bg #f48085;
+@define-color wm_button_close_active_bg #e6262f;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #212429;
+@define-color wm_button_unfocused_bg #22252b;
+@define-color wm_button_hover_bg #212429;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #141619;
+@define-color wm_button_unfocused_border #1a1c20;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #777d86;
+@define-color wm_icon_unfocused_bg #575c63;
+@define-color wm_icon_hover_bg #838993;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #292D33;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 3c17239..6fcaf6f 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -3377,4 +3377,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #282c32;
 @define-color wm_highlight #2c2f36;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #e45e65;
+@define-color wm_button_close_hover_bg #f48085;
+@define-color wm_button_close_active_bg #e6262f;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #212429;
+@define-color wm_button_unfocused_bg #22252b;
+@define-color wm_button_hover_bg #212429;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #141619;
+@define-color wm_button_unfocused_border #1a1c20;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #777d86;
+@define-color wm_icon_unfocused_bg #575c63;
+@define-color wm_icon_hover_bg #838993;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #292D33;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 59d5c1d..fe074c4 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -3368,4 +3368,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #eff0f2;
 @define-color wm_highlight #eff0f2;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #f37076;
+@define-color wm_button_close_hover_bg #f79da1;
+@define-color wm_button_close_active_bg #ef4048;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #fdfdfd;
+@define-color wm_button_unfocused_bg #f6f7f8;
+@define-color wm_button_hover_bg #fdfdfd;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #d8dae0;
+@define-color wm_button_unfocused_border #dddee2;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #a7adb9;
+@define-color wm_icon_unfocused_bg #babec7;
+@define-color wm_icon_hover_bg #757d91;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #ffffff;
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 9e2c26c..90234ba 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -3368,4 +3368,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #eff0f2;
 @define-color wm_highlight #eff0f2;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #f37076;
+@define-color wm_button_close_hover_bg #f79da1;
+@define-color wm_button_close_active_bg #ef4048;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #fdfdfd;
+@define-color wm_button_unfocused_bg #f6f7f8;
+@define-color wm_button_hover_bg #fdfdfd;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #d8dae0;
+@define-color wm_button_unfocused_border #dddee2;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #a7adb9;
+@define-color wm_icon_unfocused_bg #babec7;
+@define-color wm_icon_hover_bg #757d91;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #ffffff;