From 8fa229c58ed0e7cca90389f455f8fbe73faed728 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Thu, 10 Apr 2025 13:22:58 +0800 Subject: [PATCH] update --- libs/lib-install.sh | 4 ++++ src/sass/_theme-options.scss | 3 +++ src/sass/gnome-shell/_common.scss | 2 +- src/sass/gnome-shell/_drawing.scss | 6 +++--- src/sass/gnome-shell/common/_a11y.scss | 4 ++-- src/sass/gnome-shell/common/_calendar.scss | 4 ++-- src/sass/gnome-shell/common/_corner-ripple.scss | 2 +- src/sass/gnome-shell/common/_keyboard.scss | 4 ++-- src/sass/gnome-shell/common/_misc.scss | 2 +- src/sass/gnome-shell/common/_popovers.scss | 10 +++++----- src/sass/gnome-shell/common/_screen-shield.scss | 2 +- src/sass/gnome-shell/common/_tiled-previews.scss | 2 +- src/sass/gnome-shell/widgets-40-0/_screen-shield.scss | 2 +- src/sass/gnome-shell/widgets-42-0/_screenshot.scss | 4 ++-- src/sass/gnome-shell/widgets-44-0/_quick-settings.scss | 8 ++++---- src/sass/gnome-shell/widgets-46-0/_message-list.scss | 2 +- src/sass/gnome-shell/widgets-47-0/_dialogs.scss | 6 +++--- src/sass/gnome-shell/widgets-48-0/_message-list.scss | 2 +- src/sass/gnome-shell/widgets-48-0/_quick-settings.scss | 8 ++++---- 19 files changed, 42 insertions(+), 35 deletions(-) diff --git a/libs/lib-install.sh b/libs/lib-install.sh index 661d379d..6fc5318e 100755 --- a/libs/lib-install.sh +++ b/libs/lib-install.sh @@ -937,6 +937,10 @@ shell_base() { customize_theme() { cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"} + if [[ "${GNOME_VERSION}" -ge '47-0' ]]; then + sed $SED_OPT "/\$shell_version/s/old/new/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + fi + # Darker dark colors if [[ "${darker}" == 'true' ]]; then prompt -s "Changing dark color style to darker one ...\n" diff --git a/src/sass/_theme-options.scss b/src/sass/_theme-options.scss index a66ef198..b524544c 100644 --- a/src/sass/_theme-options.scss +++ b/src/sass/_theme-options.scss @@ -37,3 +37,6 @@ $darker: 'false'; // GDM login dialog scale $scale: 'default'; + +// gnome-shell version +$shell_version: 'old'; diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index aac8a4a8..f4290e11 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -25,7 +25,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; // reset colors -@if $gnome_version == 'new' and $accent_type == 'default' { +@if $shell_version == 'new' and $accent_type == 'default' { $selected_bg_color: -st-accent-color; $primary_color: -st-accent-color; } diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss index 1aae21b8..ab89dc3a 100644 --- a/src/sass/gnome-shell/_drawing.scss +++ b/src/sass/gnome-shell/_drawing.scss @@ -127,7 +127,7 @@ $entry_shell_bg: if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1)); @if $t == focus { box-shadow: inset 0 0 0 1px transparent !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { border: 2px solid lighten($fc, 15%) !important; } @else { border: 2px solid st-lighten($fc, 15%) !important; @@ -233,7 +233,7 @@ $button_shell_bg: if($variant == 'light', mix(black, $button_shell, 6%), mix(whi border: none; text-shadow: none; icon-shadow: none; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($tc, $c, 6%); } @else { background-color: st-mix($tc, $c, 6%); @@ -245,7 +245,7 @@ $button_shell_bg: if($variant == 'light', mix(black, $button_shell, 6%), mix(whi border: none; text-shadow: none; icon-shadow: none; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($tc, $c, 12%); } @else { background-color: st-mix($tc, $c, 12%); diff --git a/src/sass/gnome-shell/common/_a11y.scss b/src/sass/gnome-shell/common/_a11y.scss index b1c1ebc9..e0956571 100644 --- a/src/sass/gnome-shell/common/_a11y.scss +++ b/src/sass/gnome-shell/common/_a11y.scss @@ -4,7 +4,7 @@ height: 48px; border-radius: 24px; // radius equals the size of the box to give us the curve - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: lighten(transparentize($primary_color, 0.7), 30%); box-shadow: 0 0 2px 2px lighten($primary_color, 20%); } @else { @@ -20,7 +20,7 @@ -pie-border-width: 3px; -pie-border-color: $primary_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { -pie-background-color: lighten(transparentize($primary_color, 0.7), 40%); } @else { -pie-background-color: st-lighten(st-transparentize($primary_color, 0.7), 40%); diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss index a296be45..dec9c467 100644 --- a/src/sass/gnome-shell/common/_calendar.scss +++ b/src/sass/gnome-shell/common/_calendar.scss @@ -199,7 +199,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas } &:active { - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: darken($primary_color, 5%); } @else { background-color: st-darken($primary_color, 5%); @@ -215,7 +215,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas &:hover, &:focus { color: $light_fg_color !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: lighten($primary_color, 8%); } @else { background-color: st-lighten($primary_color, 8%); diff --git a/src/sass/gnome-shell/common/_corner-ripple.scss b/src/sass/gnome-shell/common/_corner-ripple.scss index fb94b5b8..ef11c0a3 100644 --- a/src/sass/gnome-shell/common/_corner-ripple.scss +++ b/src/sass/gnome-shell/common/_corner-ripple.scss @@ -8,7 +8,7 @@ $ripple_size: 50px; height: $ripple_size + 2px; border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: transparentize($primary_color, 0.65); box-shadow: 0 0 2px 2px lighten($primary_color, 20%); } @else { diff --git a/src/sass/gnome-shell/common/_keyboard.scss b/src/sass/gnome-shell/common/_keyboard.scss index dae05257..8a5b2582 100644 --- a/src/sass/gnome-shell/common/_keyboard.scss +++ b/src/sass/gnome-shell/common/_keyboard.scss @@ -63,7 +63,7 @@ $default_key_bg_color: if($variant=='light', darken($solid_osd_bg_color, 11%), l background-color: $primary_color; box-shadow: 0 2px 3px rgba(black, 0.15); - @if $gnome_version == 'old' { + @if $shell_version == 'old' { &:focus, &:hover { color: $light_fg_color; background-color: lighten($primary_color, 5%); } &:checked, &:active { color: $light_fg_color; background-color: darken($primary_color, 10%); } } @else { @@ -105,7 +105,7 @@ $default_key_bg_color: if($variant=='light', darken($solid_osd_bg_color, 11%), l .emoji-panel { .keyboard-key:latched { background-color: $primary_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { border-color: lighten($primary_color, 5%); } @else { border-color: st-lighten($primary_color, 5%); diff --git a/src/sass/gnome-shell/common/_misc.scss b/src/sass/gnome-shell/common/_misc.scss index 56ced4b3..1f95ed0e 100644 --- a/src/sass/gnome-shell/common/_misc.scss +++ b/src/sass/gnome-shell/common/_misc.scss @@ -3,7 +3,7 @@ border: 1px solid $primary_color; border-radius: 3px; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: transparentize($primary_color, 0.3); } @else { background-color: st-transparentize($primary_color, 0.3); diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss index eaabe451..825dfbac 100644 --- a/src/sass/gnome-shell/common/_popovers.scss +++ b/src/sass/gnome-shell/common/_popovers.scss @@ -1,8 +1,8 @@ /* Popovers/Menus */ -$popover_opacity: if($trans == 'false', 1, if($gnome_version == 'new', 0.92, 0.96)); +$popover_opacity: if($trans == 'false', 1, if($shell_version == 'new', 0.92, 0.96)); $popop_menuitem_radius: $po_radius - $base_padding; -$popover_bg_color: if($variant == 'light', rgba($base_color, $popover_opacity), rgba($bg_color, $popover_opacity)); +$popover_bg_color: if($variant == 'light', rgba($bg_color, $popover_opacity), rgba($base_color, $popover_opacity)); //.the popover itself .popup-menu-boxpointer { @@ -128,7 +128,7 @@ $popover_bg_color: if($variant == 'light', rgba($base_color, $popover_opacity), &:active { color: $selected_fg_color !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($fg_color, $selected_bg_color, 5%) !important; } @else { background-color: st-mix($fg_color, $selected_bg_color, 5%) !important; @@ -146,7 +146,7 @@ $popover_bg_color: if($variant == 'light', rgba($base_color, $popover_opacity), &:active, &.selected:active { color: $selected_fg_color !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($fg_color, $selected_bg_color, 5%) !important; } @else { background-color: st-mix($fg_color, $selected_bg_color, 5%) !important; @@ -180,7 +180,7 @@ $popover_bg_color: if($variant == 'light', rgba($base_color, $popover_opacity), &:active { color: $selected_fg_color !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($fg_color, $selected_bg_color, 5%) !important; } @else { background-color: st-mix($fg_color, $selected_bg_color, 5%) !important; diff --git a/src/sass/gnome-shell/common/_screen-shield.scss b/src/sass/gnome-shell/common/_screen-shield.scss index 1f2e7838..72ba695d 100644 --- a/src/sass/gnome-shell/common/_screen-shield.scss +++ b/src/sass/gnome-shell/common/_screen-shield.scss @@ -70,7 +70,7 @@ background-color: transparentize($bg_color,0.7); &:hover, &:focus { background-color: transparentize($bg_color, 0.5); } - @if $gnome_version == 'old' { + @if $shell_version == 'old' { &:active { background-color: transparentize($selected_bg_color, 0.5); } } @else { &:active { background-color: st-transparentize($selected_bg_color, 0.5); } diff --git a/src/sass/gnome-shell/common/_tiled-previews.scss b/src/sass/gnome-shell/common/_tiled-previews.scss index acc5447e..1753d866 100644 --- a/src/sass/gnome-shell/common/_tiled-previews.scss +++ b/src/sass/gnome-shell/common/_tiled-previews.scss @@ -4,7 +4,7 @@ $tile_corner_radius: $base_border_radius + 1px; .tile-preview { - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: transparentize($primary_color, 0.75); } @else { background-color: st-transparentize($primary_color, 0.75); diff --git a/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss b/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss index 740d4b8c..7113bc37 100644 --- a/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss +++ b/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss @@ -3,7 +3,7 @@ StButton#vhandle, StButton#hhandle { background-color: transparentize($bg_color, 0.7); &:hover, &:focus { background-color: transparentize($bg_color, 0.5); } - @if $gnome_version == 'old' { + @if $shell_version == 'old' { &:active { background-color: transparentize($primary_color, 0.5); } } @else { &:active { background-color: st-transparentize($primary_color, 0.5); } diff --git a/src/sass/gnome-shell/widgets-42-0/_screenshot.scss b/src/sass/gnome-shell/widgets-42-0/_screenshot.scss index d8427621..8f122132 100644 --- a/src/sass/gnome-shell/widgets-42-0/_screenshot.scss +++ b/src/sass/gnome-shell/widgets-42-0/_screenshot.scss @@ -170,7 +170,7 @@ $screenshot_ui_button_red: $error_color; .screenshot-ui-window-selector-window { &:hover { .screenshot-ui-window-selector-window-border { - @if $gnome_version == 'old' { + @if $shell_version == 'old' { border-color: darken($primary_color, 15%); } @else { border-color: st-darken($primary_color, 15%); @@ -181,7 +181,7 @@ $screenshot_ui_button_red: $error_color; &:checked { .screenshot-ui-window-selector-window-border { border-color: $primary_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: transparentize($primary_color, 0.8); } @else { background-color: st-transparentize($primary_color, 0.8); diff --git a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss index 47bd9b42..04aa5c9d 100644 --- a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss +++ b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss @@ -40,7 +40,7 @@ &:hover { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 6%) !important; } @else { background-color: st-mix($text_color, $primary_color, 6%) !important; @@ -49,7 +49,7 @@ &:active { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 15%) !important; } @else { background-color: st-mix($text_color, $primary_color, 15%) !important; @@ -109,7 +109,7 @@ &:hover { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 6%) !important; } @else { background-color: st-mix($text_color, $primary_color, 6%) !important; @@ -118,7 +118,7 @@ &:active { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 15%) !important; } @else { background-color: st-mix($text_color, $primary_color, 15%) !important; diff --git a/src/sass/gnome-shell/widgets-46-0/_message-list.scss b/src/sass/gnome-shell/widgets-46-0/_message-list.scss index 9e4edd74..dbc49847 100644 --- a/src/sass/gnome-shell/widgets-46-0/_message-list.scss +++ b/src/sass/gnome-shell/widgets-46-0/_message-list.scss @@ -66,7 +66,7 @@ border-style: solid; &:focus { - @if $gnome_version == 'old' { + @if $shell_version == 'old' { border-color: transparentize($selected_bg_color, 0.4); } @else { border-color: st-transparentize($selected_bg_color, 0.4); diff --git a/src/sass/gnome-shell/widgets-47-0/_dialogs.scss b/src/sass/gnome-shell/widgets-47-0/_dialogs.scss index 0360926f..f2e8e953 100644 --- a/src/sass/gnome-shell/widgets-47-0/_dialogs.scss +++ b/src/sass/gnome-shell/widgets-47-0/_dialogs.scss @@ -16,7 +16,7 @@ &:hover { color: white !important; background-gradient-direction: none !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: lighten($primary_color, 9%); } @else { background-color: st-lighten($primary_color, 9%); @@ -26,7 +26,7 @@ &:active { color: white !important; background-gradient-direction: none !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: darken($primary_color, 5%); } @else { background-color: st-darken($primary_color, 5%); @@ -35,7 +35,7 @@ &:insensitive { background-gradient-direction: none !important; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: transparentize($primary_color, 0.9); color: transparentize($primary_color, 0.65) !important; } @else { diff --git a/src/sass/gnome-shell/widgets-48-0/_message-list.scss b/src/sass/gnome-shell/widgets-48-0/_message-list.scss index 8d2da5a4..6a327e29 100644 --- a/src/sass/gnome-shell/widgets-48-0/_message-list.scss +++ b/src/sass/gnome-shell/widgets-48-0/_message-list.scss @@ -55,7 +55,7 @@ border-style: solid; &:focus { - @if $gnome_version == 'old' { + @if $shell_version == 'old' { border-color: transparentize($selected_bg_color, 0.4); } @else { border-color: st-transparentize($selected_bg_color, 0.4); diff --git a/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss index d7d7ced4..a4c5b1a6 100644 --- a/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss +++ b/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss @@ -40,7 +40,7 @@ &:hover { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 6%) !important; } @else { background-color: st-mix($text_color, $primary_color, 6%) !important; @@ -49,7 +49,7 @@ &:active { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 15%) !important; } @else { background-color: st-mix($text_color, $primary_color, 15%) !important; @@ -111,7 +111,7 @@ &:hover { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 6%) !important; } @else { background-color: st-mix($text_color, $primary_color, 6%) !important; @@ -120,7 +120,7 @@ &:active { color: $light_fg_color; - @if $gnome_version == 'old' { + @if $shell_version == 'old' { background-color: mix($text_color, $primary_color, 15%) !important; } @else { background-color: st-mix($text_color, $primary_color, 15%) !important;