This commit is contained in:
vinceliuice 2024-05-11 07:14:31 +08:00
parent b6587fe07d
commit 1780c36eb8
5 changed files with 31 additions and 29 deletions

View File

@ -100,7 +100,7 @@
} }
@mixin entry($t, $fc: $primary_color, $tc: $fg_color, $bc: $entry_shell_bg) { @mixin entry($t, $fc: $primary_color, $tc: $fg_color, $c: $entry_shell_bg) {
// //
// entry // entry
// //
@ -109,7 +109,7 @@
// //
@if $t == normal { @if $t == normal {
background-color: $bc; background-color: $c;
border-radius: $circular_radius; border-radius: $circular_radius;
border: 2px solid transparent !important; border: 2px solid transparent !important;
box-shadow: inset 0 0 0 1px rgba($borders_color, 0) !important; box-shadow: inset 0 0 0 1px rgba($borders_color, 0) !important;
@ -127,12 +127,12 @@
} }
@if $t == insensitive { @if $t == insensitive {
background-color: rgba($bc, 0.05); background-color: rgba($c, 0.05);
color: $disabled_fg_color; color: $disabled_fg_color;
} }
@if $t == flat-normal { @if $t == flat-normal {
background-color: $bc; background-color: $c;
border-radius: $circular_radius; border-radius: $circular_radius;
border: none !important; border: none !important;
box-shadow: none !important; box-shadow: none !important;
@ -140,20 +140,20 @@
} }
@if $t == flat-hover { @if $t == flat-hover {
background-color: $bc; background-color: $c;
box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05) !important; box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05) !important;
color: $tc; color: $tc;
} }
@if $t == flat-focus { @if $t == flat-focus {
border: none !important; border: none !important;
background-color: rgba($bc, 0.2); background-color: rgba($c, 0.2);
color: $tc; color: $tc;
} }
@if $t == flat-insensitive { @if $t == flat-insensitive {
border: none !important; border: none !important;
background-color: rgba($bc, 0.05); background-color: rgba($c, 0.05);
color: rgba($tc, 0.45); color: rgba($tc, 0.45);
} }
} }
@ -204,19 +204,14 @@
@if $t == normal { @if $t == normal {
color: $tc; color: $tc;
background-color: $c; background-color: $c;
border: 1px solid $button_borders; border: none;
@if $variant=='light' { box-shadow: 0 1px 2px 0 rgba(black, 0.02); }
@if $variant=='dark' {
box-shadow: inset 0 1px $button_highlight;
}
text-shadow: none; text-shadow: none;
icon-shadow: none; icon-shadow: none;
} }
@if $t == focus { @if $t == focus {
color: $tc; color: $tc;
background-color: $c;
text-shadow: none; text-shadow: none;
icon-shadow: none; icon-shadow: none;
box-shadow: none !important; box-shadow: none !important;
@ -224,8 +219,8 @@
@if $t == hover { @if $t == hover {
color: $tc; color: $tc;
border: 1px solid $button_borders;
background-color: if($variant=='light', darken($c, 3%), lighten($c, 3%)); background-color: if($variant=='light', darken($c, 3%), lighten($c, 3%));
border: none;
text-shadow: none; text-shadow: none;
icon-shadow: none; icon-shadow: none;
} }
@ -233,15 +228,15 @@
@if $t == active { @if $t == active {
color: $tc; color: $tc;
background-color: if($variant=='light', darken($c, 5%), lighten($c, 5%)); background-color: if($variant=='light', darken($c, 5%), lighten($c, 5%));
border: 1px solid $button_borders; border: none;
text-shadow: none; text-shadow: none;
icon-shadow: none; icon-shadow: none;
} }
@if $t == checked { @if $t == checked {
color: $tc; color: $selected_fg_color;
background-color: $selected_bg_color; background-color: $selected_bg_color;
border: 1px solid $selected_bg_color; border: none;
text-shadow: none; text-shadow: none;
icon-shadow: none; icon-shadow: none;
} }
@ -249,7 +244,7 @@
@if $t == insensitive { @if $t == insensitive {
color: if($tc == $fg_color, $disabled_fg_color, $tc); color: if($tc == $fg_color, $disabled_fg_color, $tc);
background-color: if($c == $base_color, $divider_color, $c); background-color: if($c == $base_color, $divider_color, $c);
border-color: if($variant == 'light', $button_border, $dark_borders_color); border: none;
text-shadow: none; text-shadow: none;
icon-shadow: none; icon-shadow: none;
} }

View File

@ -19,11 +19,11 @@
} }
%default_button { %default_button {
@include button(flat-normal); @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
&:hover { @include button(flat-hover); } &:hover { @include button(hover, $c:$selected_bg_color, $tc:$selected_fg_color); }
&:active { @include button(flat-active); } &:active { @include button(active, $c:$selected_bg_color, $tc:$selected_fg_color); }
&:insensitive { @include button(flat-insensitive); } &:insensitive { @include button(insensitive, $c:$selected_bg_color, $tc:$selected_fg_color); }
&:focus { @include button(flat-focus); } &:focus { @include button(focus, $c:$selected_bg_color, $tc:$selected_fg_color); }
} }
.button { .button {

View File

@ -292,7 +292,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
.events-button { .events-button {
@extend %popover_bubble; @extend %popover_bubble;
padding: $base_padding * 3 !important; padding: $base_padding * 3 !important;
margin: $base_margin $base_padding + $base_margin !important; margin: $base_padding $base_padding + $base_margin !important;
} }
// Events // Events

View File

@ -11,7 +11,7 @@ StEntry, %entry {
@include entry(normal); @include entry(normal);
&:hover { @include entry(hover); } &:hover { @include entry(hover); }
&:focus { @include entry(focus); } &:focus { @include entry(focus); }
&:insensitive { @include entry(insensitive);} &:insensitive { @include entry(insensitive); }
StIcon { icon-size: $base_icon_size !important; } StIcon { icon-size: $base_icon_size !important; }

View File

@ -1,6 +1,6 @@
.quick-settings { .quick-settings {
padding: $base_padding * 3; padding: $base_padding * 3 !important;
border-radius: $modal_radius * 2.25; border-radius: 21px + $base_padding * 3 !important;
margin-top: $base_padding * 2 !important; margin-top: $base_padding * 2 !important;
.icon-button, .button { .icon-button, .button {
@ -20,7 +20,7 @@
min-width: 13em; min-width: 13em;
max-width: 13em; max-width: 13em;
min-height: 42px; min-height: 42px;
border:none; border: none;
} }
.quick-toggle { .quick-toggle {
@ -141,6 +141,7 @@
border-radius: $base_border_radius * 3; border-radius: $base_border_radius * 3;
padding: $base_padding * 3; padding: $base_padding * 3;
margin: $base_padding * 2 $base_padding * 6 0; margin: $base_padding * 2 $base_padding * 6 0;
border: none !important;
.popup-menu-item { .popup-menu-item {
border-radius: $circular_radius !important; border-radius: $circular_radius !important;
@ -229,6 +230,12 @@
.device-subtitle { color: transparentize($fg_color, 0.5); } .device-subtitle { color: transparentize($fg_color, 0.5); }
.keyboard-brightness-level {
spacing: $base_padding;
.button:checked { @extend %default_button; }
}
// background apps // background apps
.background-apps-quick-toggle { .background-apps-quick-toggle {