Sync cinnamon with upstream at Linux Mint (mamolinux#54)

cinnamon-shell/src/cinnamon-shell-sass/_colors.scss

@@ -25,6 +25,13 @@ $destructive_color: if($variant=='light', $red, darken($red, 10%));
 $osd_fg_color: #eeeeec;
 $osd_text_color: white;
 $osd_bg_color: transparentize(lighten($jet, 2%), 0.025);
+
+$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
+$osd_button_border: transparentize(darken($osd_bg_color, 20%), 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: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
@@ -71,36 +78,25 @@ $switch_bg_color: if($variant=='light', $accent_bg_color, darken($accent_bg_colo
 $switch_border_color: if($variant=='light', darken($accent_bg_color, 15%), darken($borders_color, 5%));
 $focus_border_color: lighten($accent_bg_color, 14%);
 
-// Yaru: color variables imported from Mint's cinnamon theme
+// Sucharu: color variables imported from Mint's cinnamon theme
 // which are not in gnome-shell but are necessary to generate
-// yaru cinnamon theme. We might modify/remove them later after
-// all the yaru specific styles have been included in _tweaks.scss
+// sucharu cinnamon theme. We might modify/remove them later after
+// all the sucharu specific styles have been included in _tweaks.scss
 
-// Yaru: we already have fg color defined in gnome-shell, we prefer to use them
-// $text_color: if($variant == 'light', #202020, #D3D3D3);
+// Sucharu: we already have fg color defined in gnome-shell, we prefer to use them
 $text_color: $fg_color;
 
 $separator_color: if($variant=='light', darken($bg_color, 15%), darken($bg_color, 6%));
 
-$tooltip_bg_color: #fbeaa0;
-$tooltip_fg_color: #4a4a4a;
+$tooltip_bg_color: transparentize(mix($selected_bg_color, black, 95%), 0.05);
+$tooltip_fg_color: $selected_fg_color;
 $tooltip_border_color: #d0d0d0;
 
-$osd_bg_color: #353535;
-
-$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
-$osd_button_border: transparentize(darken($osd_bg_color, 20%), 0.6);
-
-$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
-$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6);
-
-// Yaru: we are imitating gnome-shell panel
+// Sucharu: we are imitating gnome-shell panel
 // which uses white-ish fg on dark bg
 // for both light and dark mode
 $panel_bg: $panel_bg_color;
 $panel_fg: $panel_fg_color;
-// $panel_bg: $bg_color;
-// $panel_fg: $fg_color;
 
 $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
 $entry_border: if($variant=='light', #cfd6e6, darken($borders_color, 0%));
@@ -115,3 +111,8 @@ $noaccent_dark_bg_color: #525352;
 $noaccent_dark_fg_color: #ffffff;
 $noaccent_selected_bg_color: if($variant=='light', $noaccent_light_bg_color, $noaccent_dark_bg_color);
 $noaccent_selected_fg_color: if($variant=='light', $noaccent_light_fg_color, $noaccent_dark_fg_color);
+
+$applet_separator_color: if($variant == 'light', darken($bg_color, 15%), rgba(255,255,255, 0.12));
+
+$corner_bar_unhighlighted: $applet_separator_color;
+$corner_bar_highlighted: if($variant == 'light', darken($applet_separator_color, 10%), opacify($applet_separator_color, .1));

cinnamon-shell/src/cinnamon-shell-sass/_common.scss

@@ -239,14 +239,15 @@ StScrollBar {
 // Tooltip
 //
 #Tooltip {
-  border: 1px solid $tooltip_border_color;
-  border-radius: 3px;
-  padding: 5px 12px;
+  border: none;
+  border-radius: 5px;
+  padding: 12px 12px;
   background-color: $tooltip_bg_color;
   color: $tooltip_fg_color;
   font-size: 1em;
   font-weight: normal;
   text-align: center;
+  margin: 3px;
 }
 
 //
@@ -1046,8 +1047,10 @@ StScrollBar {
 // Notifications
 //
 #notification {
-  border: 1px solid $borders_color;
-  border-radius: 3px;
+  box-shadow: 0 1px 15px 4px $borders_color;
+  border-top-color: $selected_bg_color;
+  border-top: 4px;
+  border-radius: 5px;
   background-color: $bg_color;
   padding: 13px;
   spacing-rows: 10px;
@@ -1473,9 +1476,10 @@ StScrollBar {
       background-color: $noaccent_selected_bg_color;
       border: 1px solid $borders_color;
     }
-    &-hover {
-      background-color: red;
-      border-radius: 2px;
+    &:hover {
+      background-color: mix($noaccent_selected_bg_color, $bg_color, 40%);
+      border: 1px solid mix($borders_color, $bg_color, 40%);
+      border-radius: 0px;
     }
     &-greyed {
       padding: 7px;
@@ -1748,12 +1752,12 @@ StScrollBar {
   &-number-label {
     font-size: 0.8em;
     z-index: 99;
-    color: $tooltip_border_color;
+    color: $selected_fg_color;
   }
 
   &-badge {
     border-radius: 9999px;
-    background-color: $tooltip_fg_color;
+    background-color: $selected_bg_color;
     margin: 0;
   }
 
@@ -1884,7 +1888,7 @@ StScrollBar {
 
   &-overlay {
     width: 290px;
-    height: 70px;
+    height: 5.4em;
     padding: 15px;
     spacing: 0.5em;
     background: transparentize($bg_color, 0.1);
@@ -2064,11 +2068,11 @@ StScrollBar {
 
   &-separator-line {
     width: 1px;
-    background: rgba(255,255,255, 0.12);
+    background: $applet_separator_color;
 
     &-vertical {
       height: 1px;
-      background: rgba(255,255,255, 0.12);
+      background: $applet_separator_color;
     }
   }
 
@@ -2152,13 +2156,13 @@ StScrollBar {
 //
 .applet-cornerbar {
   width: 8px;
-  background-color: transparentize(black, 0.8);
+  background-color: $corner_bar_unhighlighted;
 
   &-box {
     padding: 4px 4px;
 
-    &:hover {
-      background-color: $noaccent_selected_bg_color;
+    &:hover > .applet-cornerbar {
+      background-color: $corner_bar_highlighted;
     }
   }