tweak color scheme and window buttons

2 files changed, 66 insertions, 52 deletions

diff --git a/common/cinnamon/sass/_colors.scss b/common/cinnamon/sass/_colors.scss
index 9c51858..47daa0f 100644
--- a/common/cinnamon/sass/_colors.scss
+++ b/common/cinnamon/sass/_colors.scss
@@ -2,15 +2,15 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant =='light', #ffffff, #383C45);
+$base_color: if($variant =='light', #ffffff, #404552);
 $text_color: if($variant == 'light', #5c616c, #D3DAE3);
-$bg_color: if($variant =='light', #F5F6F7, #444852);
+$bg_color: if($variant =='light', #F5F6F7, #383C4A);
 $fg_color: if($variant =='light', #5c616c, #D3DAE3);
 
 $selected_fg_color: #ffffff;
 $selected_bg_color: #5294E2;
 $selected_borders_color: darken($selected_bg_color, 20%);
-$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%));
+$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%));
 
 $link_color: if($variant == 'light', darken($selected_bg_color,10%),
                                      lighten($selected_bg_color,20%));
@@ -28,63 +28,67 @@ $suggested_color: #4DADD4;
 $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
 $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
-
-$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
-$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
-
-$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
-$button_border: $entry_border;
-
 $header_bg: red;
 @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); }
 @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; }
-@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); }
-@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; }
+@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); }
+@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; }
 
 $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%));
 
-$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));
+$header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%));
 
 $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%));
 $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg);
 
-$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049);
+$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945);
 $dark_sidebar_fg: #BAC3CF;
-$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%));
+$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%));
 
 $osd_fg_color: $dark_sidebar_fg;
-$osd_bg_color: darken($dark_sidebar_bg, 8%);
+$osd_bg_color: $dark_sidebar_bg;
+
+$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
+$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6);
+
+$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
+$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6);
 
 $osd_insensitive_bg_color: darken($osd_bg_color, 3%);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%);
 $osd_borders_color: transparentize(black, 0.3);
 
-$panel_bg: darken($osd_bg_color, 4.7%);
-$panel_fg: $osd_fg_color;
+$panel_bg: darken($dark_sidebar_bg, 4.7%);
+$panel_fg: $dark_sidebar_fg;
+
+$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
+$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
+
+$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1));
+$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
+
+$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
+$button_border: $entry_border;
+
+$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1));
+$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
 
 //WM Buttons
 
 // Close
-$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_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841);
 
-$wm_icon_close_bg: $selected_fg_color;
-$wm_icon_close_hover_bg: $selected_fg_color;
-$wm_icon_close_active_bg: $selected_fg_color;
+$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f);
 
 // Minimize, Maximize
-$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32);
-$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035);
-$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C);
 $wm_button_active_bg: $selected_bg_color;
 
-$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21);
-$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328);
-$wm_button_hover_border: $selected_bg_color;
-$wm_button_active_border: $selected_bg_color;
+$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932);
 
-$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8);
-$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78);
-$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5);
+$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC);
 $wm_icon_active_bg: $selected_fg_color;
diff --git a/common/cinnamon/sass/_drawing.scss b/common/cinnamon/sass/_drawing.scss
index 03b9f15..738a69d 100644
--- a/common/cinnamon/sass/_drawing.scss
+++ b/common/cinnamon/sass/_drawing.scss
@@ -15,42 +15,47 @@
 // Entries drawing function
 //
   //@extend %reset_style;
-    box-shadow: inset 0 0 transparentize($base_color, 1);
 
   @if $t==normal {
     color: $text_color;
     background-color: $entry_bg;
     border: 1px solid $entry_border;
+    box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95);
   }
 
   @if $t==focus {
     color: $fg_color;
     background-color: $entry_bg;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95);
   }
 
   @if $t==insensitive {
     color: $insensitive_fg_color;
     background-color: mix($entry_bg, $bg_color, 55%);
     border-color: 1px solid mix($entry_border, $bg_color, 55%);
+    box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95);
   }
 
   @if $t==osd {
     color: $osd_fg_color;
-    background-color: transparentize(black, 0.8);
-    border: 1px solid transparentize(black, 0.6);
+    background-color: $osd_entry_bg;
+    border: 1px solid $osd_entry_border;
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-focus {
-    color: $osd_fg_color;
-    background-color: transparentize(black, 0.8);
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-insensitive {
-    color: $osd_insensitive_fg_color;
-    background-color: transparentize(black, 0.9);
-    border-color: 1px solid transparentize(black, 0.6);
+    color: transparentize($osd_fg_color, 0.45);
+    background-color: transparentize($osd_entry_bg, 0.15);
+    border: 1px solid $osd_entry_border;
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 }
 
@@ -63,7 +68,6 @@
   //@extend %reset_style;
 
   text-shadow: 0 1px transparentize($base_color, 1);
-  box-shadow: inset 0 0 transparentize($base_color, 1);
 
   @if $t==normal {
   //
@@ -72,6 +76,7 @@
     color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $button_border;
+    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
   }
 
   @else if $t==focus {
@@ -81,15 +86,17 @@
     color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
   }
 
   @else if $t==focus-hover {
   //
   // focused button
   //
-    color: $selected_bg_color;
+    color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
   }
 
   @else if $t==hover {
@@ -97,8 +104,9 @@
   // hovered button
   //
     color: $fg_color;
-    background-color: $button_bg;
-    border: 1px solid $selected_bg_color;
+    background-color: lighten($button_bg, 5%);
+    border: 1px solid $button_border;
+    box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95);
   }
 
   @else if $t==active {
@@ -108,6 +116,7 @@
     color: $selected_fg_color;
     background-color: $selected_bg_color;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px $selected_bg_color;
   }
 
   @else if $t==insensitive {
@@ -117,6 +126,7 @@
     color: $insensitive_fg_color;
     border: 1px solid transparentize($button_border, 0.45);
     background-color: transparentize($button_bg, 0.45);
+    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
   }
 
   @else if $t==osd {
@@ -124,8 +134,8 @@
   // normal osd button
   //
     color: $osd_fg_color;
-    border: 1px solid transparentize(black, 0.55);
-    background-color: transparentize(black, 0.7);
+    border: 1px solid $osd_button_border;
+    background-color: $osd_button_bg;
   }
 
   @else if $t==osd-hover {
@@ -133,8 +143,8 @@
   // active osd button
   //
     color: $osd_fg_color;
-    border: 1px solid $selected_bg_color;
-    background-color: transparentize(black, 0.7);
+    border: 1px solid $osd_button_border;
+    background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
   }
 
   @else if $t==osd-active {
@@ -151,7 +161,7 @@
   // insensitive osd button
   //
     color: $osd_insensitive_fg_color;
-    border: 1px solid transparentize(black, 0.55);
-    background-color: transparentize(black, 0.85);
+    border: 1px solid $osd_button_border;
+    background-color: transparentize($osd_button_bg, 0.15);
   }
 }