This commit is contained in:
vinceliuice 2025-04-10 11:54:13 +08:00
parent a40015ccb6
commit e289dab0ac
13 changed files with 33 additions and 27 deletions

View File

@ -187,18 +187,20 @@ $dialog_bg_color: if($variant == 'light', $bg_color, $base_col
//OSD colors
$osd_fg_color: if($scheme == 'nord', #dadada, #d3d7df);
$osd_bg_color: if($trans == 'true', rgba(if($darker == 'true', #1a1a1a, #2a2a2a), $opacity), if($darker == 'true', #1a1a1a, #2a2a2a));
$solid_osd_bg_color: if($darker == 'true', #1a1a1a, #2a2a2a);
@if $scheme == 'nord' {
$osd_bg_color: if($trans == 'true', rgba(if($darker == 'true', #16191e, #222730), $opacity), if($darker == 'true', #16191e, #222730));
$solid_osd_bg_color: if($darker == 'true', #16191e, #222730);
}
$osd_button_bg: gtkalpha(lighten($osd_bg_color, 22%), $opacity);
$osd_bg_color: if($trans == 'true', gtkalpha($solid_osd_bg_color, $opacity), $solid_osd_bg_color);
$osd_button_bg: gtkalpha(lighten($solid_osd_bg_color, 22%), $opacity);
$osd_button_border: $dark_borders_color;
$osd_entry_bg: gtkalpha(lighten($osd_bg_color, 22%), $opacity);
$osd_entry_bg: gtkalpha(lighten($solid_osd_bg_color, 22%), $opacity);
$osd_entry_border: $dark_borders_color;
$osd_disabled_bg_color: darken($osd_bg_color, 3%);
$osd_disabled_fg_color: gtkalpha($osd_fg_color, 0.35);
$osd_disabled_bg_color: darken($solid_osd_bg_color, 3%);
$osd_disabled_fg_color: gtkalpha($solid_osd_bg_color, 0.35);
$osd_borders_color: $dark_borders_color;
// Menu colors

View File

@ -5,9 +5,9 @@ $asset_path: assets;
//
$font-size: 9;
$font-family: Futura Bk bt, sans, Sans-Serif;
$_bubble_bg_color: opacify($osd_bg_color,0.25);
$_bubble_bg_color: gtkalpha($solid_osd_bg_color, 0.25);
$_bubble_fg_color: $osd_fg_color;
$_bubble_borders_color: transparentize($osd_fg_color,0.8);
$_bubble_borders_color: transparentize($osd_fg_color, 0.8);
/* General Typography */
%large_title {
@ -591,7 +591,7 @@ StScrollBar {
}
.expo-background {
background-color: opacify($osd_bg_color, 1);
background-color: $solid_osd_bg_color;
}
.workspace {
@ -2217,7 +2217,7 @@ StScrollBar {
.slider {
height: 0.5em;
padding: 0;
border: 0px solid darken($osd_bg_color, 8%);
border: 0px solid darken($solid_osd_bg_color, 8%);
border-bottom: 1px;
-slider-height: 0.5em;
-slider-background-color: if($variant == 'light', $button_border, darken($bg_color, 5%));

View File

@ -4,7 +4,7 @@ $key_size: 1.2em;
$key_border_radius: $base_border_radius + 3px;
$key_bg_color: $bg_color;
// $default_key_bg_color: darken($key_bg_color, 4%);
$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
$default_key_bg_color: if($variant=='light', darken($solid_osd_bg_color, 11%), lighten($solid_osd_bg_color, 2%));
// draw keys using button function

View File

@ -1,7 +1,7 @@
/* Login Dialog */
#lockDialogGroup {
background-color: rgba($osd_bg_color, 1);
background-color: $solid_osd_bg_color;
background-image: url("assets/background.png");
background-size: cover;

View File

@ -2,7 +2,7 @@
// Dialog
#LookingGlassDialog {
background-color: rgba($osd_bg_color, 1);
background-color: $solid_osd_bg_color;
spacing: $base_padding;
margin: $base_padding;
padding: 0;
@ -141,7 +141,7 @@
// Inspector
#LookingGlassPropertyInspector {
background: lighten(rgba($osd_bg_color, 1), 5%);
background: lighten($solid_osd_bg_color, 5%);
border: 1px solid black;
border-radius: $wm_radius;
padding: $base_padding * 2;

View File

@ -73,5 +73,5 @@
/* Workspace animation */
.workspace-animation {
background-color: rgba($osd_bg_color, 1);
background-color: $solid_osd_bg_color;
}

View File

@ -13,7 +13,7 @@
text-shadow: none;
box-shadow: 0 3px 5px rgba(black, 0.15);
&:hover { background-color: rgba($menu_bg, 1); }
&:hover { background-color: $menu_bg; }
&:focus { background-color: $menu_bg; }

View File

@ -3,7 +3,7 @@
}
#overviewGroup {
background-color: rgba($osd_bg_color, 1);
background-color: $solid_osd_bg_color;
// background-image: url("assets/background.png");
// background-repeat: no-repeat;
// background-size: cover;

View File

@ -47,5 +47,5 @@ $window_close_button_padding: 3px;
// keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
border-radius: 30px;
background-color: $osd_bg_color;
box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7);
box-shadow: 0 4px 16px 4px transparentize(darken($solid_osd_bg_color, 30%), 0.7);
}

View File

@ -817,7 +817,7 @@ button {
&.osd {
color: $osd_fg_color;
background-color: $osd_bg_color;
border-color: darken($osd_bg_color, 8%);
border-color: darken($solid_osd_bg_color, 8%);
&.image-button, &.round-button {
padding: 0;
@ -4107,15 +4107,18 @@ tooltip {
&, &.csd {
// background-color needs to be set this way otherwise it gets drawn twice
// see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
background-color: lighten($osd_bg_color, 10%);
background-color: $osd_bg_color;
background-clip: padding-box;
border-radius: $bt_radius;
border-radius: $wm_radius;
color: $osd_fg_color;
border: 1px solid $wm_shadow;
box-shadow: inset 0 0 0 1px $highlight_color;
label { padding: $container_padding; }
}
}
border-radius: $bt_radius;
border-radius: $wm_radius;
box-shadow: none;
decoration { background-color: transparent; }

View File

@ -5273,7 +5273,7 @@ tooltip {
&.background {
// background-color needs to be set this way otherwise it gets drawn twice
// see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
background-color: gtkalpha($osd_bg_color, 0.96);
background-color: $osd_bg_color;
background-clip: padding-box;
border-radius: $wm_radius;
color: $osd_fg_color;

View File

@ -2160,7 +2160,7 @@ stack:disabled.view.polari-entry-area { background-image: image($bg_color); }
&, &.solid {
color: lighten($osd_fg_color, 7%);
background-color: $osd_bg_color;
border: 1px solid darken($osd_bg_color, 8%);
border: 1px solid darken($solid_osd_bg_color, 8%);
border-radius: 2px;
}
@ -2171,7 +2171,7 @@ stack:disabled.view.polari-entry-area { background-image: image($bg_color); }
border-color: $selected_bg_color;
}
&.empty { background-color: darken($osd_bg_color, 5%); }
&.empty { background-color: darken($solid_osd_bg_color, 5%); }
}
trough { background: none; }

View File

@ -67,7 +67,7 @@ panel-toplevel.background {
//
MsdOsdWindow.background.osd {
border-radius: 2px;
border: 1px solid darken($osd_bg_color, 8%);
border: 1px solid darken($solid_osd_bg_color, 8%);
.progressbar {
background-color: $selected_bg_color;
@ -75,8 +75,9 @@ MsdOsdWindow.background.osd {
border-color: red;
border-radius: 5px;
}
.trough {
background-color: darken($osd_bg_color, 5%);
background-color: darken($solid_osd_bg_color, 5%);
border: none;
border-radius: 5px;
}