some fixes

5 files changed, 32 insertions, 23 deletions

diff --git a/common/gtk-3.0/3.16/_colors.scss b/common/gtk-3.0/3.16/_colors.scss
index 10040cd..c53454d 100644
--- a/common/gtk-3.0/3.16/_colors.scss
+++ b/common/gtk-3.0/3.16/_colors.scss
@@ -72,26 +72,26 @@ $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_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #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_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #212429);
+$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #22252b);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #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_border: if($variant == 'light' and $darker == 'false', #d8dae0, #141619);
+$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #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_bg: if($variant == 'light' and $darker == 'false', #a7adb9, #777d86);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #babec7, #575c63);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #757d91, #838993);
 $wm_icon_active_bg: $selected_fg_color;
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 0c3c607..3c7f2de 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -2666,6 +2666,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index be69d55..7d59919 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -2667,6 +2667,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
@@ -3375,22 +3378,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #32383f;
 @define-color wm_highlight #363c44;
 @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_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 #fdfdfd;
-@define-color wm_button_unfocused_bg #f6f7f8;
-@define-color wm_button_hover_bg #fdfdfd;
+@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 #d8dae0;
-@define-color wm_button_unfocused_border #dddee2;
+@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 #a7adb9;
-@define-color wm_icon_unfocused_bg #babec7;
-@define-color wm_icon_hover_bg #757d91;
+@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 #ffffff;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index c81d4da..84f29d8 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -2666,6 +2666,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css
index 7391d1f..20b78fd 100644
--- a/common/gtk-3.0/3.16/gtk.css
+++ b/common/gtk-3.0/3.16/gtk.css
@@ -1 +1 @@
-@import url("gtk-contained-darker.css");
+@import url("gtk-contained.css");