Update gnome shell sources with upstream (#75)

- Rebase source scss files from yaru
- Add Sucharu precific modifications to
  panel and dash backgrounds
- Update meson build script for gnome-shell

gnome-shell/src/gnome-shell-sass/README.md

@@ -11,6 +11,6 @@ will then be synchronized periodically before releases.
 GNOME Shell Sass is distributed under the terms of the GNU General Public
 License, version 2 or later. See the [COPYING][license] file for details.
 
-[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
+[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/HEAD/data/theme/gnome-shell-sass
 [sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
 [license]: COPYING

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

@@ -1,83 +1,87 @@
-// When color definition differs for dark and light variant,
-// it gets @if-ed depending on $variant
-@import 'palette';
+//
+// Main color definitions
+//
+// When color definition differs for dark and light variant, it gets @if-ed depending on $variant
 
-$base_color: if($variant=='light', #ffffff, lighten($jet, 4%));
+@import '_palette.scss';
+//@import '_default-colors.scss';
+@import '_yaru-default-colors.scss';
+
+// global colors
+$base_color: if($variant == 'light', $light_1, $_base_color_dark);
+$bg_color: if($variant == 'light', $_base_color_light, lighten($base_color, 5%));
+$fg_color: if($variant == 'light', $_base_color_dark, $light_1);
+
+// Yaru, customize global colors
 $bg_color_dark: lighten($jet, 2%);
 $bg_color: if($variant=='light', #FAFAFA, $bg_color_dark);
 $fg_color_dark: $porcelain;
 $fg_color: if($variant=='light', $inkstone, $fg_color_dark);
 
-$selected_fg_color: $accent_fg_color;
-$selected_bg_color: if($variant=='light', $accent_bg_color, darken($accent_bg_color, 4%));
-// Yaru: Ignore transformations when using dark accent colors
-$selected_bg_color: $accent_bg_color;
-$selected_borders_color: if($variant=='light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+// OSD elements
+$osd_fg_color: $light_1;
+$osd_bg_color: lighten($_base_color_dark, 5%);
+
+// system elements (e.g. the overview) that are always dark
+$system_base_color: $_base_color_dark;
+$system_fg_color: $_base_color_light;
+
+// Yaru override
+$system_fg_color: darken($porcelain, 2%);
+
+// panel colors
+$panel_bg_color: if($variant == 'light', lighten($accent_bg_color, 10%), darken($accent_bg_color, 10%));
+$panel_fg_color: if($variant == 'light', $_base_color_dark, $light_1);
 
-$borders_color_dark: lighten(desaturate(lighten($jet, 4%), 100%), 14%); // Yaru: used for dash and other dark elements on light theme
-$borders_color: if($variant=='light', darken($bg_color, 20%), $borders_color_dark);
-$alt_borders_color: if($variant=='light', darken($bg_color, 24%), darken($bg_color, 10%));
-$borders_edge: if($variant=='light', transparentize(white, 0.2), transparentize($fg_color, 0.85));
+// card elements
+$card_bg_color: if($variant == 'light', $light_1, lighten($bg_color, 7%));
+$card_shadow_color: if($variant == 'light', transparentize($dark_5, .97), transparent);
+$card_shadow_border_color: if($variant == 'light', transparentize($dark_5, .91), transparent);
 
-$link_color: if($variant=='light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
-$link_visited_color: if($variant=='light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
-$top_hilight: $borders_edge;
+//
+// Derived Colors
+//
+// colors based on the global defines above
 
-$warning_color: $yellow;
-$error_color: $red;
-$success_color: lighten($green, 5%);
-$destructive_color: if($variant=='light', $red, darken($red, 10%));
+// borders
+$borders_color: transparentize($fg_color, $border_opacity);
+$outer_borders_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%));
 
-$osd_fg_color: #eeeeec;
-$osd_bg_color: transparentize(lighten($jet, 2%), 0.025);
-$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);
-$osd_outer_borders_color: transparentize(white, 0.84);
+// Yaru borders color
+$borders_color: if($variant=='light', darken($bg_color, 20%), $yaru_borders_color_dark);
+$outer_borders_color: transparentize($fg_color, 0.85);
 
-$shadow_color: transparentize(black, 0.9);
+// osd colors
+$osd_borders_color: transparentize($osd_fg_color, 0.9);
+$osd_outer_borders_color: transparentize($osd_fg_color, 0.98);
 
-// overview background color
+// system colors
+$system_bg_color: lighten($system_base_color, 5%);
 $system_bg_color: lighten($jet, 4%); // Lighten than dash but darken than bg-color
+$system_borders_color: transparentize($system_fg_color, .9);
+$system_insensitive_fg_color: mix($system_fg_color, $system_bg_color, 50%);
+$system_overlay_bg_color: mix($system_base_color, $system_fg_color, 90%); // for non-transparent items, e.g. dash
 
-//insensitive state derived colors
-$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+// insensitive state
+$insensitive_fg_color: if($variant == 'light', mix($fg_color, $bg_color, 60%),  mix($fg_color, $bg_color, 50%));
 $insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: $borders_color;
-
-//colors for the backdrop state, derived from the main colors.
-$backdrop_base_color: if($variant=='light', darken($base_color, 1%), lighten($base_color, 1%));
-$backdrop_bg_color: $bg_color;
-$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
-$backdrop_insensitive_color: if($variant=='light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
-$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
-$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
-
-$base_hover_color: transparentize(white, 0.8);
-$base_active_color: transparentize(white, 0.75);
-$hover_fg_color: lighten($selected_fg_color, .25);
-$active_fg_color: transparentize($selected_fg_color, .5);
-
-$panel_bg_color: if($variant=='light', lighten($accent_bg_color, 10%), darken($accent_bg_color, 10%));
-$panel_fg_color: $fg_color;
-$dash_background_color: lighten($jet, 2%);
-$panel-alpha-value: 0.6;
-$panel_opaque_value: 0.0;
-
-$dash-alpha-value: 0.6;
-$dash-opaque-alpha-value: 0.0;
-
-//special cased widget colors
-$suggested_bg_color: if($variant=='light', lighten($green, 5%), darken($green, 5%));
-$suggested_border_color: if($variant=='light', darken($suggested_bg_color, 5%), darken($suggested_bg_color, 10%));
-$progress_bg_color: if($variant=='light', lighten($accent_bg_color, 10%), lighten($accent_bg_color, 5%));
-$checkradio_bg_color: if($variant=='light', lighten($accent_bg_color, 5%), $accent_bg_color);
-$checkradio_fg_color: $accent_fg_color;
-$switch_bg_color: if($variant=='light', $accent_bg_color, darken($accent_bg_color, 8%));
-$switch_border_color: if($variant=='light', darken($accent_bg_color, 15%), darken($borders_color, 5%));
-$focus_border_color: lighten($accent_bg_color, 14%);
-
-// Yaru: Ignore transformations when using dark accent colors
-$selected_bg_color: $accent_bg_color;
-$progress_bg_color: $accent_bg_color;
-$checkradio_bg_color: $accent_bg_color;
+$insensitive_borders_color: mix($borders_color, $base_color, 60%);
+
+// checked state
+$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 9%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 9%));
+
+// hover state
+// Yaru: we want the hover bg to be a visible gray for dark and light shell themes
+$hover_bg_color: transparentize($fg_color, 0.9);
+$hover_fg_color: $fg_color;
+$hover_borders_color: lighten($borders_color, 5%);
+
+// active state
+$active_bg_color: if($variant=='light', darken($bg_color, 11%), lighten($bg_color, 12%));
+$active_fg_color: if($variant=='light', darken($fg_color, 11%), lighten($fg_color, 12%));
+
+// selection colors
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%));
+
+@import '_yaru-colors.scss';