gnome-shell: Simplify colors code by just overriding what we need

So we can reduce even more delta

Author: 3v1n0

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

@@ -4,7 +4,7 @@
 // When color definition differs for dark and light variant, it gets @if-ed depending on $variant
 
 @import '_palette.scss';
-//@import '_default-colors.scss';
+@import '_default-colors.scss';
 @import '_yaru-default-colors.scss';
 
 // global colors

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

@@ -34,3 +34,19 @@ $green: #0e8420;
 $blue: #19B6EE;
 $linkblue: #007aa6;
 $darkblue: #335280;
+
+// Redefine some GNOME colors we are ok with
+$light_1: white;
+$light_2: $porcelain;
+
+$dark_4: lighten($jet, 4%);
+$dark_5: black;
+
+$red_3: $red;
+$red_4: darken($red, 10%);
+
+$green_4: lighten($green, 5%);
+$green_5: darken($green, 5%);
+
+$yellow_4: darken($yellow, 1%);
+$yellow_3: $yellow;

gnome-shell/src/gnome-shell-sass/_yaru-default-colors.scss

@@ -1,57 +1,6 @@
-// Named Colors
-
-// Redefine some GNOME colors we are ok with
-$light_1: white !default;
-$dark_5: black !default;
-
-// base colors
+// override base colors
 $_base_color_dark: lighten($jet, 4%); // Yaru: use our colors
 $_base_color_light: $light_1; // Yaru: use our colors
 
-// colors for destructive elements
-$destructive_bg_color: if($variant=='light', $red, darken($red, 10%)); // Yaru: use our colors
-$destructive_fg_color: $light_1;
-$destructive_color: $destructive_bg_color;
-
-// colors for levelbars, entries, labels and infobars
-$success_bg_color: if($variant == 'light', lighten($green, 5%), darken($green, 5%)); // Yaru: use our colors
-$success_fg_color: $light_1;
-$success_color: $success_bg_color;
-
-$warning_bg_color: if($variant == 'light', darken($yellow, 1%), $yellow); // Yaru: use our colors
-$warning_fg_color: transparentize(black, .2);
-$warning_color: $warning_bg_color;
-
-$error_bg_color: $red; // Yaru: use our colors
-$error_fg_color: $light_1;
-$error_color: $error_bg_color;
-
-// link colors
-$link_color: if($variant =='light', st-darken(-st-accent-color, 10%), st-lighten(-st-accent-color, 20%));
-$link_visited_color: st-transparentize($link_color, .6);
-
-// special cased widget definitions
-$background_mix_factor: if($variant == 'light', 12%, 9%); // used to boost the color of backgrounds in different variants
-$border_opacity: if($variant == 'light', .85, .9); // change the border opacity in different variants
-
-// shadows
-$shadow_color: if($variant == 'light', rgba(0,0,0,.05), rgba(0,0,0,0.2));
-$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
-
-// focus colors
-$focus_color: -st-accent-color;
-$focus_border_color: st-transparentize($focus_color, 0.5);
-
 // Used for dash and other dark elements on light theme
 $yaru_borders_color_dark: lighten(desaturate(lighten($jet, 4%), 100%), 14%);
-
-// High Contrast overrides
-@if $contrast == 'high' {
-    // increase border opacity
-    $border_opacity: .5;
-    // remove shadows
-    $shadow_color: transparent;
-    $text_shadow_color: transparent;
-    // less transparent focus color
-    $focus_border_color: st-transparentize($focus_color, 0.2);
-}

sessions/meson.build

@@ -3,8 +3,6 @@ gnomeshell_mode_dir = join_paths(get_option('datadir'), 'gnome-shell', 'modes')
 conf_data = configuration_data()
 conf_data.set('ThemeName', meson.project_name())
 conf_data.set('LowerCaseThemeName', meson.project_name().to_lower())
-conf_data.set('DefaultVariant',
-    get_option('gnome-shell-default-variant').endswith('dark') ? 'dark' : 'light')
 
 resource_path = gnomeshell_use_gresource ? join_paths('theme', meson.project_name(), '') : ''
 conf_data.set('ThemeResourcePath', resource_path)