From f4e03aa440ac7919f1caad910b7aa52cf6da8801 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Mon, 25 Apr 2022 14:40:29 +0200 Subject: [PATCH] style: Sync default colors with libadwaita - include GNOME HIG color palette - sync warning, error, success and destructive colors with libadwaita, improving contrast for dark theme Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2280 --- data/theme/gnome-shell-sass/_colors.scss | 56 ++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss index 7dfe66624..73db6fe03 100644 --- a/data/theme/gnome-shell-sass/_colors.scss +++ b/data/theme/gnome-shell-sass/_colors.scss @@ -1,6 +1,54 @@ // When color definition differs for dark and light variant, // it gets @if-ed depending on $variant +//GNOME Color Palette +$blue_1: #99c1f1; +$blue_2: #62a0ea; +$blue_3: #3584e4; +$blue_4: #1c71d8; +$blue_5: #1a5fb4; +$green_1: #8ff0a4; +$green_2: #57e389; +$green_3: #33d17a; +$green_4: #2ec27e; +$green_5: #26a269; +$yellow_1: #f9f06b; +$yellow_2: #f8e45c; +$yellow_3: #f6d32d; +$yellow_4: #f5c211; +$yellow_5: #e5a50a; +$orange_1: #ffbe6f; +$orange_2: #ffa348; +$orange_3: #ff7800; +$orange_4: #e66100; +$orange_5: #c64600; +$red_1: #f66151; +$red_2: #ed333b; +$red_3: #e01b24; +$red_4: #c01c28; +$red_5: #a51d2d; +$purple_1: #dc8add; +$purple_2: #c061cb; +$purple_3: #9141ac; +$purple_4: #813d9c; +$purple_5: #613583; +$brown_1: #cdab8f; +$brown_2: #b5835a; +$brown_3: #986a44; +$brown_4: #865e3c; +$brown_5: #63452c; +$light_1: #ffffff; +$light_2: #f6f5f4; +$light_3: #deddda; +$light_4: #c0bfbc; +$light_5: #9a9996; +$dark_1: #77767b; +$dark_2: #5e5c64; +$dark_3: #3d3846; +$dark_4: #241f31; +$dark_5: #000000; + + $base_color: if($variant == 'light', #fff, darken(desaturate(#241f31, 100%), 2%)); $bg_color: if($variant == 'light', #f6f5f4, lighten($base_color, 5%)); $fg_color: if($variant == 'light', transparentize(black, .2), white); @@ -15,10 +63,10 @@ $borders_edge: if($variant == 'light', rgba(255,255,255,0.8), lighten($bg_color, $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%)); -$warning_color: if($variant == 'light', #e5a50a, #f5c211);; -$error_color: if($variant == 'light', #e01b24, #c01c28); -$success_color: if($variant == 'light', #2ec27e, #26a269); -$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%)); +$warning_color: if($variant == 'light', $yellow_5, #cd9309); +$error_color: if($variant == 'light', $red_3, $red_4); +$success_color: if($variant == 'light', $green_4, $green_5); +$destructive_color: $error_color; $osd_fg_color: white; $osd_bg_color: transparentize(desaturate($bg_color, 100%),0.04);