From 9f9646c02a19335eb2d48d6b9a19136d9ec8fbf7 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Thu, 3 Apr 2025 08:21:25 +0800 Subject: [PATCH] update --- src/sass/_colors.scss | 2 +- src/sass/gnome-shell/_widgets-48-0.scss | 2 +- src/sass/gnome-shell/common/_calendar.scss | 2 +- .../widgets-48-0/_message-list.scss | 42 +++++--------- .../widgets-48-0/_notifications.scss | 57 +++++++++++++++++++ src/sass/gtk/apps/_gnome-40.0.scss | 26 +++++++-- 6 files changed, 95 insertions(+), 36 deletions(-) create mode 100644 src/sass/gnome-shell/widgets-48-0/_notifications.scss diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 4966ce96..7690935c 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -149,7 +149,7 @@ $header_border: if($variant == 'light', mix(black, $header_b // Sidebar colors $dark_sidebar_bg: white; -$opacity: 0.95; +$opacity: if($gnome_version == 'new', 0.92, 0.95); @if $trans=='true' { @if $variant=='light' { diff --git a/src/sass/gnome-shell/_widgets-48-0.scss b/src/sass/gnome-shell/_widgets-48-0.scss index 38137f43..4a6a6397 100644 --- a/src/sass/gnome-shell/_widgets-48-0.scss +++ b/src/sass/gnome-shell/_widgets-48-0.scss @@ -30,7 +30,7 @@ @import 'widgets-46-0/dash'; @import 'widgets-47-0/dialogs'; @import 'widgets-48-0/message-list'; -@import 'widgets-46-0/notifications'; +@import 'widgets-48-0/notifications'; @import 'widgets-40-0/overview'; @import 'widgets-42-0/osd'; @import 'widgets-40-0/panel'; diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss index 19a8622e..a296be45 100644 --- a/src/sass/gnome-shell/common/_calendar.scss +++ b/src/sass/gnome-shell/common/_calendar.scss @@ -29,7 +29,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas } .datemenu-popover { - border-radius: $base_border_radius + $base_padding * 2.5 !important; + border-radius: $bt_radius + $base_padding * 4 !important; } // Calendar menu side column 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 87ba3e22..8d2da5a4 100644 --- a/src/sass/gnome-shell/widgets-48-0/_message-list.scss +++ b/src/sass/gnome-shell/widgets-48-0/_message-list.scss @@ -3,24 +3,13 @@ .message-list { width: 29em; - padding: 0 $base_margin; text-shadow: none; border: none; + padding: 0 $base_margin; // padding and margins to account for scrollbar - &:ltr { - margin-left: 0; - margin-right: 0; - padding-right: 0; - border-right-width: 0; - } - - &:rtl { - margin-right: 0; - margin-left: 0; - padding-left: 0; - border-left-width: 0; - } + &:ltr { margin-left: 0; margin-right: 0; padding-right: $base_padding; border-right-width: 0; } + &:rtl { margin-right: 0; margin-left: 0; padding-left: $base_padding; border-left-width: 0; } .message-list-placeholder { @extend %title_2; @@ -37,8 +26,8 @@ .message-view { // to account for scrollbar - &:ltr {margin-right: $base_margin * 3; } - &:rtl {margin-left: $base_margin * 3;} + &:ltr { margin-right: $base_margin * 5; } + &:rtl { margin-left: $base_margin * 5; } -st-vfade-offset: 68px; @@ -99,10 +88,10 @@ } } -$card_bg_color: if($variant == 'light', mix(white, $bg_color, 95%), lighten($base_color, 7%)); +$card_bg_color: if($variant == 'light', mix(white, $bg_color, 95%), lighten($base_color, 10%)); %card { - border-radius: $base_border_radius; + border-radius: $bt_radius + $base_padding * 1.5; padding: $base_padding; margin: $base_margin; background-color: $card_bg_color; @@ -132,21 +121,20 @@ $card_bg_color: if($variant == 'light', mix(white, $bg_color, 95%), lighten($bas // message bubbles .message { border: 1px solid transparent; - border-left: none; .popup-menu & { @extend %card; } &:second-in-stack { - background-color: if($variant == 'light', darken($card_bg_color, 4%), darken($card_bg_color, 1%)); - box-shadow: 0 1px 3px rgba(black, 0.05); + background-color: if($variant == 'light', darken($card_bg_color, 3%), darken($card_bg_color, 2%)); + box-shadow: 0 1px 2px rgba(black, 0.05); } &:lower-in-stack { - background-color: if($variant == 'light', darken($card_bg_color, 7%), darken($card_bg_color, 4%)); - box-shadow: none; - border-color: if($variant == 'light', darken($card_bg_color, 10%), transparent); // a not ideal workaround for light theme + background-color: if($variant == 'light', darken($card_bg_color, 5%), darken($card_bg_color, 4%)); + box-shadow: 0 1px 2px rgba(black, 0.01); + border-color: transparent; // a not ideal workaround for light theme } // message header @@ -223,14 +211,14 @@ $card_bg_color: if($variant == 'light', mix(white, $bg_color, 95%), lighten($bas // icon size and color icon-size: $base_icon_size * 3; // 48px - -st-icon-style: symbolic; &.message-themed-icon { border-radius: $circular_radius; // is circular background-color: transparentize($fg_color, 0.8); icon-size: $base_icon_size; - min-width: $base_icon_size * 3; - min-height: $base_icon_size * 3; + min-width: $base_icon_size * 2; + min-height: $base_icon_size * 2; + padding: $base_icon_size / 2; } } diff --git a/src/sass/gnome-shell/widgets-48-0/_notifications.scss b/src/sass/gnome-shell/widgets-48-0/_notifications.scss new file mode 100644 index 00000000..fcf259b3 --- /dev/null +++ b/src/sass/gnome-shell/widgets-48-0/_notifications.scss @@ -0,0 +1,57 @@ +/* Notifications & Message Tray */ + +$notification_banner_height: 64px; +$notification_banner_width: 34em; + +// Banner notifications +.notification-banner { + min-height: $notification_banner_height; + width: $notification_banner_width; + border-radius: $wm_radius; + margin: $base_padding * 2; + padding: $base_padding; + color: $fg_color; + background-color: $menu_bg; + border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75)); + text-shadow: none; + box-shadow: 0 3px 5px rgba(black, 0.15); + + &:hover, &:active { background-color: rgba($menu_bg, 1); } +} + +.notification-buttons-bin { + spacing: 0; + padding: 0; +} + +.notification-button { + min-height: 40px; + padding: 0 16px; + background-color: $fill_color; + color: $alt_fg_color; + font-weight: 500; + border: 1px solid transparent; + border-radius: $bt_radius; + + &:focus { + background-color: $base_color; + color: $fg_color; + box-shadow: inset 0 0 0 2px $divider_color !important; + } + + &:hover { + background-color: $divider_color; + color: $fg_color; + box-shadow: none; + } + + &:active, &:checked { + background-color: $track_color; + color: $fg_color; + } + + &:insensitive { + background-color: transparent; + color: $alt_disabled_fg_color; + } +} diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss index 6c27ce25..43bc480a 100644 --- a/src/sass/gtk/apps/_gnome-40.0.scss +++ b/src/sass/gtk/apps/_gnome-40.0.scss @@ -266,12 +266,6 @@ navigation-view-page > toolbarview > scrolledwindow > viewport > clamp { } } -// Extensions -window.nightthemeswitcher headerbar { - background: $header_bg; - color: $header_fg; -} - // // Gnome Control Center // @@ -1288,6 +1282,17 @@ window.background.csd { } } +// +// Gnome extensions tool +// +popover.details-popover { + .actions { + border-spacing: 6px; + + > button { padding: 8px; } + } +} + // // Ptyxis // @@ -1307,6 +1312,15 @@ window.background.csd { background-image: none; } +// +// Other Extensions +// + +window.nightthemeswitcher headerbar { + background: $header_bg; + color: $header_fg; +} + // // Pamac manager //