Compare commits

...

6 Commits

Author SHA1 Message Date
vinceliuice
5cbdad0eb6 update 2025-04-10 17:28:59 +08:00
vinceliuice
e754e93a2d update 2025-04-10 13:41:26 +08:00
vinceliuice
8fa229c58e update 2025-04-10 13:22:58 +08:00
vinceliuice
12aa63f12d update 2025-04-10 12:41:17 +08:00
vinceliuice
e289dab0ac Fixed #1258 2025-04-10 11:54:13 +08:00
vinceliuice
a40015ccb6 Update _common-4.0.scss 2025-04-10 11:38:08 +08:00
33 changed files with 175 additions and 128 deletions

View File

@ -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"

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' {
@ -187,28 +187,28 @@ $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', rgba($solid_osd_bg_color, $opacity), $solid_osd_bg_color);
$osd_button_bg: rgba(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: rgba(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: 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));
@ -271,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

@ -37,3 +37,6 @@ $darker: 'false';
// GDM login dialog scale
$scale: 'default';
// gnome-shell version
$shell_version: 'old';

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

@ -23,11 +23,33 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
@if $gnome_version == 'new' and $accent_type == 'default' {
// reset colors
@if $shell_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,13 +121,13 @@
}
@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;
}
@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;
@ -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
@ -229,8 +233,8 @@
border: none;
text-shadow: none;
icon-shadow: none;
@if $gnome_version == 'old' {
background-color: gtkmix($tc, $c, 6%);
@if $shell_version == 'old' {
background-color: mix($tc, $c, 6%);
} @else {
background-color: st-mix($tc, $c, 6%);
}
@ -241,8 +245,8 @@
border: none;
text-shadow: none;
icon-shadow: none;
@if $gnome_version == 'old' {
background-color: gtkmix($tc, $c, 12%);
@if $shell_version == 'old' {
background-color: mix($tc, $c, 12%);
} @else {
background-color: st-mix($tc, $c, 12%);
}

View File

@ -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%);

View File

@ -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%);

View File

@ -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 {

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
@ -63,7 +63,7 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
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($osd_bg_color, 11%), lighten
.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%);

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;
@ -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

@ -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

@ -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);
@ -73,5 +73,5 @@
/* Workspace animation */
.workspace-animation {
background-color: rgba($osd_bg_color, 1);
background-color: $solid_osd_bg_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: rgba($menu_bg, 1); }
&:focus { background-color: $menu_bg; }
&, &:hover, &:focus {
color: $fg_color;
background-color: $popover_bg_color;
}
.notification-icon { padding: $base_padding; }
@ -34,8 +33,8 @@
}
.notification-button {
min-height: 40px;
padding: 0 16px;
min-height: $medium_size;
padding: 0 $base_padding * 2;
background-color: transparent;
color: $alt_fg_color;
font-weight: 500;

View File

@ -1,6 +1,8 @@
/* Popovers/Menus */
$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($bg_color, $popover_opacity), rgba($base_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);
@ -126,7 +128,7 @@ $popop_menuitem_radius: $po_radius - $base_padding;
&: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;
@ -144,7 +146,7 @@ $popop_menuitem_radius: $po_radius - $base_padding;
&: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;
@ -178,7 +180,7 @@ $popop_menuitem_radius: $po_radius - $base_padding;
&: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;

View File

@ -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); }

View File

@ -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);

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

@ -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); }

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

@ -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);

View File

@ -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;

View File

@ -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);

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 {
@ -25,8 +26,8 @@ $notification_banner_width: 34em;
}
.notification-button {
min-height: 40px;
padding: 0 16px;
min-height: $medium_size;
padding: 0 $base_padding * 2;
background-color: $fill_color;
color: $alt_fg_color;
font-weight: 500;

View File

@ -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 {

View File

@ -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);

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 {
@ -25,8 +23,8 @@ $notification_banner_width: 34em;
}
.notification-button {
min-height: 40px;
padding: 0 16px;
min-height: $medium_size;
padding: 0 $base_padding * 2;
background-color: $fill_color;
color: $alt_fg_color;
font-weight: 500;

View File

@ -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;

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

@ -1926,7 +1926,7 @@ actionbar > revealer > box {
background-color: transparent;
color: inherit;
box-shadow: none;
padding-top: $container_padding;
padding: $container_padding;
&:backdrop {
background-color: transparent;
@ -2759,8 +2759,6 @@ cursor-handle {
//
popover.menu {
padding: 0;
box.inline-buttons {
padding: 0 $container_padding;
@ -5275,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

@ -236,35 +236,29 @@ toast {
viewswitcher {
margin: 0;
min-height: 26px;
min-height: $small_size + 8px;
border-spacing: $container_padding / 2;
&.wide {
border-spacing: $container_padding / 2;
&.narrow {
margin-top: 0;
margin-bottom: 0;
min-height: $container_padding;
}
&.narrow > button.toggle {
border-radius: 0;
margin: 0;
indicatorbin > image {
-gtk-icon-size: 12px;
}
}
> button.toggle {
button.toggle {
font-weight: normal;
padding: 0;
> stack > box {
&.narrow {
font-size: 0.75rem;
padding-top: $container_padding;
padding-bottom: $container_padding;
border-spacing: $container_padding - 2px;
padding-top: $container_padding + 2px;
> stack > label {
padding-left: $container_padding + 2px;
padding-right: $container_padding + 2px;
> label {
min-height: 18px;
padding-left: 3px;
padding-right: 3px;
padding-bottom: 0;
}
}
@ -276,10 +270,10 @@ viewswitcher {
}
}
// AdwViewSwitcherBar
viewswitcherbar actionbar > revealer > box {
padding: 0;
padding-left: $container_padding;
padding-right: $container_padding;
padding-top: $container_padding;
}
// AdwViewSwitcherTitle
@ -354,11 +348,41 @@ indicatorbin {
> label { color: $selected_fg_color; }
}
&.badge {
> indicator,
> mask {
min-height: 13px;
}
> indicator > label {
font-size: 0.6rem;
font-weight: bold;
padding-left: 4px;
padding-right: 4px;
color: white;
}
&.needs-attention > indicator {
background: $selected_bg_color;
> label { color: $selected_fg_color; }
}
}
}
headerbar > windowhandle > box viewswitcher {
min-height: 0;
&.narrow > button.toggle {
border-radius: 0;
margin: 0;
indicatorbin > image {
-gtk-icon-size: 12px;
}
}
&.wide {
box-shadow: inset 0 0 0 1px $light_borders_color;
border-radius: $bt_radius;
@ -787,16 +811,6 @@ toolbarview.undershoot-bottom scrolledwindow {
}
}
.top-bar {
background: none;
border: none;
box-shadow: none;
.collapse-spacing {
padding: 0;
}
}
//
// AdwDialog
//

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;
}