From 0603c2b3f5afa0dae24734d322dcafd4e71fee31 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 25 Mar 2024 14:49:39 -0400 Subject: [PATCH] Rebase against gnome 46.0 first --- gnome-shell-dark.scss | 1 - gnome-shell-high-contrast.scss | 7 ++++ ...dark-laptop.scss => gnome-shell-light.scss | 3 +- gnome-shell-sass/_colors.scss | 4 +- gnome-shell-sass/_drawing.scss | 6 +-- gnome-shell-sass/_palette.scss | 10 ++--- gnome-shell-sass/widgets/_corner-ripple.scss | 2 +- gnome-shell-sass/widgets/_panel.scss | 41 ++++--------------- 8 files changed, 26 insertions(+), 48 deletions(-) create mode 100644 gnome-shell-high-contrast.scss rename gnome-shell-dark-laptop.scss => gnome-shell-light.scss (84%) diff --git a/gnome-shell-dark.scss b/gnome-shell-dark.scss index 294ac64..c1a330b 100644 --- a/gnome-shell-dark.scss +++ b/gnome-shell-dark.scss @@ -1,7 +1,6 @@ $variant: 'dark'; $contrast: 'normal'; -$laptop: false; @import "gnome-shell-sass/_colors"; //use gtk colors @import "gnome-shell-sass/_drawing"; @import "gnome-shell-sass/_common"; diff --git a/gnome-shell-high-contrast.scss b/gnome-shell-high-contrast.scss new file mode 100644 index 0000000..a4394dd --- /dev/null +++ b/gnome-shell-high-contrast.scss @@ -0,0 +1,7 @@ +$variant: 'dark'; +$contrast: "high"; + +@import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors +@import "gnome-shell-sass/_drawing"; +@import "gnome-shell-sass/_common"; +@import "gnome-shell-sass/_widgets"; diff --git a/gnome-shell-dark-laptop.scss b/gnome-shell-light.scss similarity index 84% rename from gnome-shell-dark-laptop.scss rename to gnome-shell-light.scss index 61925f9..22b8347 100644 --- a/gnome-shell-dark-laptop.scss +++ b/gnome-shell-light.scss @@ -1,7 +1,6 @@ -$variant: 'dark'; +$variant: 'light'; $contrast: 'normal'; -$laptop: true; @import "gnome-shell-sass/_colors"; //use gtk colors @import "gnome-shell-sass/_drawing"; @import "gnome-shell-sass/_common"; diff --git a/gnome-shell-sass/_colors.scss b/gnome-shell-sass/_colors.scss index 9a5450a..ffd4e9f 100644 --- a/gnome-shell-sass/_colors.scss +++ b/gnome-shell-sass/_colors.scss @@ -21,7 +21,7 @@ $system_base_color: $_base_color_dark; $system_fg_color: $_base_color_light; // panel colors -$panel_bg_color: if($variant == 'light', $_base_color_light, $dark_4); +$panel_bg_color: if($variant == 'light', $_base_color_light, $dark_5); $panel_fg_color: if($variant == 'light', $_base_color_dark, $light_1); // card elements @@ -66,4 +66,4 @@ $active_bg_color: if($variant=='light', darken($bg_color, 11%), lighten($bg_colo $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%)); +$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%)); \ No newline at end of file diff --git a/gnome-shell-sass/_drawing.scss b/gnome-shell-sass/_drawing.scss index dd6f8a8..5d56d4c 100644 --- a/gnome-shell-sass/_drawing.scss +++ b/gnome-shell-sass/_drawing.scss @@ -386,7 +386,7 @@ } // Panel menu/button drawing function -@mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $style: null, $highlighted_child: false, $child_class:"", $border_radius: 3px) { +@mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $style: null, $highlighted_child: false, $child_class:"") { // // $bg: background color, derived from $panel_fg_color // $fg: foreground color, also derived from $panel_fg_color @@ -400,7 +400,7 @@ transition-duration: 150ms; border: 3px solid transparent; background-color: transparent; - border-radius: $border_radius; + border-radius: $forced_circular_radius; font-weight: bold; color: $fg; @@ -444,7 +444,7 @@ #{$child_class} { transition-duration: 150ms; border: 3px solid transparent; - border-radius: $border_radius; + border-radius: $forced_circular_radius; } &:focus, &:hover { diff --git a/gnome-shell-sass/_palette.scss b/gnome-shell-sass/_palette.scss index 8627513..78847d9 100644 --- a/gnome-shell-sass/_palette.scss +++ b/gnome-shell-sass/_palette.scss @@ -39,8 +39,8 @@ $light_2: #f6f5f4; $light_3: #deddda; $light_4: #c0bfbc; $light_5: #9a9996; -$dark_1: #777777; -$dark_2: #5e5e5e; -$dark_3: #3d3d3d; -$dark_4: #242424; -$dark_5: #000000; +$dark_1: #77767b; +$dark_2: #5e5c64; +$dark_3: #3d3846; +$dark_4: #241f31; +$dark_5: #000000; \ No newline at end of file diff --git a/gnome-shell-sass/widgets/_corner-ripple.scss b/gnome-shell-sass/widgets/_corner-ripple.scss index 1760eda..9aff431 100644 --- a/gnome-shell-sass/widgets/_corner-ripple.scss +++ b/gnome-shell-sass/widgets/_corner-ripple.scss @@ -3,7 +3,7 @@ $ripple_size: 50px; .ripple-box { - background-color: rgba(0,0,0,0); + background-color: rgba(255,255,255,0.2); box-shadow: 0 0 2px 2px rgba(255,255,255,0.2); // plus + 2px for the border (box-shadow) width: $ripple_size + 2px; diff --git a/gnome-shell-sass/widgets/_panel.scss b/gnome-shell-sass/widgets/_panel.scss index 9b455a0..2a29eee 100644 --- a/gnome-shell-sass/widgets/_panel.scss +++ b/gnome-shell-sass/widgets/_panel.scss @@ -1,8 +1,8 @@ /* Top Bar */ // a.k.a. the panel -$privacy_indicator_color: if($variant == 'light', $orange_4, $red_3); -$recording_indicator_color: $red_3; +$privacy_indicator_color: if($variant == 'light', $orange_4, $orange_3); +$recording_indicator_color: $red_4; $transparent_panel_fg_color: $light_1; // always white for transparent lock screens $system_panel_fg_color: $system_fg_color; // always light for lockscreen, overview @@ -20,13 +20,13 @@ $panel_transition_duration: 250ms; // same as the overview transition duration // panel menus .panel-button { @include panel_button(); - -natural-hpadding: 6px; - -minimum-hpadding: 4px; + -natural-hpadding: $base_padding * 2; + -minimum-hpadding: $base_padding; // status area icons .system-status-icon { icon-size: $scalable_icon_size; - padding: 0; + padding: 0 $base_padding; margin: 0 $base_margin; } @@ -47,9 +47,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration } &#panelActivities { - -natural-hpadding: 10px; - -minimum-hpadding: 8px; - & StBoxLayout { padding: 0 $scaled_padding * 0.5; // use em padding to keep proportion spacing: 5px; @@ -72,10 +69,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration StIcon { icon-size: $scalable_icon_size; - - &:first-child { - margin-left: 3px; - } } } @@ -93,10 +86,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration // we want to exclude the do-not-disturb indicator from the background // see _drawing.scss for override details @include panel_button($highlighted_child: true, $child_class: '.clock'); - -natural-hpadding: 0px; - -minimum-hpadding: 0px; - padding-left: 0px; - padding-right: 0px; .clock { // the highlighted child @@ -155,11 +144,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration } } - .panel-status-indicators-box { - padding-right: 2px; - padding-left: 3px; - } - .panel-status-indicators-box, .panel-status-menu-box { spacing: 2px; @@ -167,14 +151,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration // spacing between power icon and (optional) percentage label .power-status.panel-status-indicators-box { - padding-left: 0px; spacing: 0; - - @if $laptop { - margin-bottom: 2px; - } @else { - margin-left: 2px; - } } // important privacy related indicators @@ -197,11 +174,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration .clock-display-box { spacing: 2px; .clock { - padding-left: 8px; - padding-right: 8px; - } - - StIcon:last-child { - margin-right: 3px; + padding-left: $scaled_padding * 2; + padding-right: $scaled_padding * 2; } }