This commit is contained in:
vinceliuice 2025-04-10 12:41:17 +08:00
parent e289dab0ac
commit 12aa63f12d
8 changed files with 54 additions and 32 deletions

View File

@ -150,7 +150,7 @@ $header_border_backdrop: if($variant == 'light', gtkmix(black, $heade
// Sidebar colors
$dark_sidebar_bg: white;
$opacity: if($gnome_version == 'new', 0.92, 0.95);
$opacity: 0.96;
@if $trans=='true' {
@if $variant=='light' {
@ -193,24 +193,22 @@ $solid_osd_bg_color: if($darker == 'true', #1a1a1a, #2a2a2a);
$solid_osd_bg_color: if($darker == 'true', #16191e, #222730);
}
$osd_bg_color: if($trans == 'true', gtkalpha($solid_osd_bg_color, $opacity), $solid_osd_bg_color);
$osd_bg_color: if($trans == 'true', rgba($solid_osd_bg_color, $opacity), $solid_osd_bg_color);
$osd_button_bg: gtkalpha(lighten($solid_osd_bg_color, 22%), $opacity);
$osd_button_bg: rgba(lighten($solid_osd_bg_color, 22%), $opacity);
$osd_button_border: $dark_borders_color;
$osd_entry_bg: gtkalpha(lighten($solid_osd_bg_color, 22%), $opacity);
$osd_entry_bg: rgba(lighten($solid_osd_bg_color, 22%), $opacity);
$osd_entry_border: $dark_borders_color;
$osd_disabled_bg_color: darken($solid_osd_bg_color, 3%);
$osd_disabled_fg_color: gtkalpha($solid_osd_bg_color, 0.35);
$osd_disabled_fg_color: rgba($solid_osd_bg_color, 0.35);
$osd_borders_color: $dark_borders_color;
// Menu colors
$menu_bg: if($variant == 'light', $base_color, $bg_color);
$menu_bd: if($variant == 'light', gtkalpha(currentColor, 0.08), gtkalpha(currentColor, 0.07));
$menu_opacity: 0.96;
@if $trans == 'true' {
$menu_bg: if($variant == 'light', gtkalpha($base_color, $menu_opacity), gtkalpha($bg_color, $menu_opacity));
$menu_bg: if($variant == 'light', gtkalpha($base_color, $opacity), gtkalpha($bg_color, $opacity));
}
$submenu_bg_color: if($variant == 'light', rgba(white, 1), rgba(white, 0.1));
@ -273,13 +271,11 @@ $dash_bg: if($variant == 'light', rgba(#d1d1d1, $panel
// Entry colors
$entry_bg: gtkalpha(currentColor, 0.05);
$entry_shell_bg: gtkalpha(currentColor, 0.1);
$entry_border: $borders_color;
$entry_highlight: gtkalpha($selection_mode_bg, 0.75);
// Button colors
$button_bg: if($variant == 'light', white, #656565);
$button_shell_bg: if($variant == 'light', gtkmix(black, $dialog_bg_color, 6%), gtkmix(white, $dialog_bg_color, 6%));
@if $scheme == 'nord' {
$button_bg: if($variant == 'light', #fbfcfd, #556075);

View File

@ -23,11 +23,33 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
// reset colors
@if $gnome_version == 'new' and $accent_type == 'default' {
$selected_bg_color: -st-accent-color;
$primary_color: -st-accent-color;
}
@if $trans == 'true' {
$menu_bg: if($variant == 'light', rgba($base_color, $opacity), rgba($bg_color, $opacity));
$osd_bg_color: rgba($solid_osd_bg_color, $opacity);
$dialog_bg_color: if($variant == 'light', rgba($bg_color, $opacity), rgba($base_color, $opacity));
}
$active_color: if($variant == 'light', rgba(black, 0.26), rgba(white, 0.2));
$track_color: if($variant == 'light', rgba(black, 0.20), rgba(white, 0.16));
$visit_color: if($variant == 'light', rgba(black, 0.16), rgba(white, 0.12));
$divider_color: if($variant == 'light', rgba(black, 0.12), rgba(white, 0.1));
$fill_color: if($variant == 'light', rgba(black, 0.06), rgba(white, 0.05));
$menu_bd: if($variant == 'light', rgba(black, 0.08), rgba(white, 0.08));
$borders_color: if($variant == 'light', rgba(black, 0.12), rgba(white, 0.12));
$light_borders_color: if($variant == 'light', rgba(black, 0.08), rgba(white, 0.10));
$dark_borders_color: if($variant == 'light', rgba(black, 0.08), rgba(black, 0.15));
$solid_borders_color: if($variant == 'light', mix(black, $base_color, 12%), mix(white, $base_color, 12%));
$dark_solid_borders_color: if($variant == 'light', mix(black, $base_color, 12%), mix(white, $base_color, 15%));
$highlight_color: if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1));
// Stage
stage {
@include fontsize($base_font_size);

View File

@ -102,6 +102,7 @@
}
}
$entry_shell_bg: if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1));
@mixin entry($t, $fc: $primary_color, $tc: $fg_color, $c: $entry_shell_bg) {
//
@ -120,7 +121,7 @@
}
@if $t == hover {
box-shadow: inset 0 0 0 1px gtkalpha($borders_color, 0.1) !important;
box-shadow: inset 0 0 0 1px rgba($borders_color, 0.1) !important;
border: 2px solid transparent !important;
}
@ -134,7 +135,7 @@
}
@if $t == insensitive {
background-color: gtkalpha($c, 0.05);
background-color: rgba($c, 0.05);
color: $disabled_fg_color;
}
@ -148,20 +149,20 @@
@if $t == flat-hover {
background-color: $c;
box-shadow: inset 0 0 0 1px gtkalpha($borders_color, 0.05) !important;
box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05) !important;
color: $tc;
}
@if $t == flat-focus {
border: none !important;
background-color: gtkalpha($c, 0.2);
background-color: rgba($c, 0.2);
color: $tc;
}
@if $t == flat-insensitive {
border: none !important;
background-color: gtkalpha($c, 0.05);
color: gtkalpha($tc, 0.45);
background-color: rgba($c, 0.05);
color: rgba($tc, 0.45);
}
}
@ -199,6 +200,9 @@
}
}
$button_shell: if($variant == 'light', $bg_color, $base_color);
$button_shell_bg: if($variant == 'light', mix(black, $button_shell, 6%), mix(white, $button_shell, 6%));
@mixin button($t, $c: $button_shell_bg, $tc: $fg_color) {
//
// button
@ -230,7 +234,7 @@
text-shadow: none;
icon-shadow: none;
@if $gnome_version == 'old' {
background-color: gtkmix($tc, $c, 6%);
background-color: mix($tc, $c, 6%);
} @else {
background-color: st-mix($tc, $c, 6%);
}
@ -242,7 +246,7 @@
text-shadow: none;
icon-shadow: none;
@if $gnome_version == 'old' {
background-color: gtkmix($tc, $c, 12%);
background-color: mix($tc, $c, 12%);
} @else {
background-color: st-mix($tc, $c, 12%);
}

View File

@ -324,7 +324,7 @@
padding: 0 !important;
border-radius: $circular_radius;
border: none;
background-color: gtkalpha(currentColor, 0.1);
background-color: rgba($light_fg_color, 0.1);
color: $light_fg_color;
}
}

View File

@ -7,15 +7,14 @@
min-height: $menuitem_size * 2;
margin: 12px 6px 8px;
border-radius: $wm_radius;
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 { background-color: $menu_bg; }
&:focus { background-color: $menu_bg; }
&, &:hover, &:focus {
color: $fg_color;
background-color: $popover_bg_color;
}
.notification-icon { padding: $base_padding; }

View File

@ -1,6 +1,8 @@
/* Popovers/Menus */
$popover_opacity: if($trans == 'false', 1, if($gnome_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));
//.the popover itself
.popup-menu-boxpointer {
@ -93,7 +95,7 @@ $popop_menuitem_radius: $po_radius - $base_padding;
padding: $base_padding;
box-shadow: 0 5px 10px 0 rgba(black, 0.18);
margin: 4px 12px 17px 12px;
background-color: $dialog_bg_color;
background-color: $popover_bg_color;
border-radius: $po_radius;
border: solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
border-width: if($variant=='light', 0, 1px);

View File

@ -10,13 +10,14 @@ $notification_banner_width: 34em;
border-radius: $wm_radius;
margin: $base_padding * 2;
padding: $scaled_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); }
&, &:hover, &:active {
color: $fg_color;
background-color: $popover_bg_color;
}
}
.notification-buttons-bin {

View File

@ -11,12 +11,10 @@ $notification_banner_width: 34em;
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));
background-color: $popover_bg_color;
border: 1px solid if($variant=='light', transparent, rgba(black, 0.75));
text-shadow: none;
box-shadow: 0 3px 5px rgba(black, 0.15);
&:hover, &:active { background-color: gtkalpha($menu_bg, 1); }
}
.notification-buttons-bin {