This commit is contained in:
vinceliuice 2023-10-15 22:51:19 +08:00
parent 9a2ad1c07f
commit f66eb8b974
6 changed files with 57 additions and 76 deletions

View File

@ -688,8 +688,8 @@ $_dot_color: $selected_bg_color;
%flat_button { %flat_button {
@include button(flat-normal); @include button(flat-normal);
&:hover { @include button(flat-hover); } &:hover { @include button(flat-hover); }
&:active, &:active:hover { @include button(flat-active); } &:active { @include button(flat-active); }
&:checked, &:checked:hover { @include button(flat-checked); } &:checked { @include button(flat-checked); }
&:disabled { @include button(flat-insensitive); } &:disabled { @include button(flat-insensitive); }
} }
@ -739,6 +739,7 @@ button {
} }
&:active, &:checked { &:active, &:checked {
@include button(active);
background-clip: if($variant=='light', border-box, padding-box); background-clip: if($variant=='light', border-box, padding-box);
transition-duration: 200ms; transition-duration: 200ms;
@ -747,33 +748,13 @@ button {
&:disabled { &:disabled {
@include button(insensitive); @include button(insensitive);
}
.background & {
&:active, &:checked { &:active, &:checked {
@include button(active); @include button(insensitive-active);
}
&:disabled {
&:active, &:checked {
@include button(insensitive-active);
}
} }
} }
.background &.flat { // reset &.image-button, &.popup {
&:active, &:checked {
@include button(flat-active);
}
&:disabled {
&:active, &:checked {
@include button(flat-insensitive-active);
}
}
}
&.image-button:not(.circular), &.popup:not(.circular) {
min-height: $menuitem_size - 4px; min-height: $menuitem_size - 4px;
min-width: $menuitem_size - 4px; min-width: $menuitem_size - 4px;
padding-left: $container_padding - 2px; padding-left: $container_padding - 2px;
@ -811,8 +792,11 @@ button {
&.popup { padding-right: $container_padding; padding-left: $container_padding; } &.popup { padding-right: $container_padding; padding-left: $container_padding; }
} }
&.close, &.circular, &.circular.flat, &.close,
&.image-button.close:not(.circular) { // The Bloody Circul Button &.circular,
&.circular.image-button,
&.circular.flat,
&.image-button.close { // The Bloody Circul Button
@extend %circular_button; @extend %circular_button;
&:active, &:checked { &:active, &:checked {
@ -2514,16 +2498,19 @@ notebook {
} }
button.flat.toggle.popup { button.flat.toggle.popup {
min-width: $medium_size;
border: none; border: none;
box-shadow: none; box-shadow: none;
border-radius: $bt_radius;
padding: 0 $container_padding / 2;
@if $monterey == 'true' { @if $monterey == 'true' {
min-width: $medium_size;
margin-top: -2px; margin-top: -2px;
margin-bottom: -2px; margin-bottom: -2px;
margin-left: $container_padding / 2; margin-left: $container_padding / 2;
border-radius: $bt_radius;
padding: 0 $container_padding / 2;
} @else {
border-radius: 0;
padding: 0;
} }
&:active, &:checked { &:active, &:checked {
@ -2625,36 +2612,26 @@ notebook {
button.flat, button.flat,
button.close-button, button.close-button,
button.image-button.flat { button.image-button.flat {
border: none;
box-shadow: none;
border-radius: 3px; border-radius: 3px;
padding: 0; padding: 0;
color: mix($bg_color, $fg_color, 35%); color: $alt_fg_color;
min-height: 16px;
min-width: 16px;
margin-top: 4px;
margin-bottom: 4px;
margin-left: $container_padding / 2; margin-left: $container_padding / 2;
margin-right: -$container_padding; margin-right: -$container_padding / 2;
@if $monterey == 'false' {
min-height: $small_size;
min-width: $small_size;
margin-top: 2px;
margin-bottom: 2px;
} @else {
min-height: 16px;
min-width: 16px;
margin-top: 4px;
margin-bottom: 4px;
margin-left: $container_padding / 2;
margin-right: -$container_padding / 2;
}
&:hover { &:hover {
@extend %undecorated_button;
color: $fg_color; color: $fg_color;
background-color: rgba($borders_color, 0.1); background-color: rgba($fg_color, 0.1);
} }
&:active { &:active {
@extend %undecorated_button;
color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%)); color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
background-color: rgba($borders_color, 0.2); background-color: rgba($fg_color, 0.2);
} }
} }
} }

View File

@ -2954,36 +2954,26 @@ notebook {
button.flat, button.flat,
button.close-button, button.close-button,
button.image-button.flat { button.image-button.flat {
border: none;
box-shadow: none;
border-radius: 3px; border-radius: 3px;
padding: 0; padding: 0;
color: mix($bg_color, $fg_color, 35%); color: $alt_fg_color;
min-height: 16px;
min-width: 16px;
margin-top: 4px;
margin-bottom: 4px;
margin-left: $container_padding / 2; margin-left: $container_padding / 2;
margin-right: -$container_padding; margin-right: -$container_padding / 2;
@if $monterey == 'false' {
min-height: $small_size;
min-width: $small_size;
margin-top: 2px;
margin-bottom: 2px;
} @else {
min-height: 16px;
min-width: 16px;
margin-top: 4px;
margin-bottom: 4px;
margin-left: $container_padding / 2;
margin-right: -$container_padding / 2;
}
&:hover { &:hover {
@extend %undecorated_button;
color: $fg_color; color: $fg_color;
background-color: rgba($borders_color, 0.1); background-color: rgba($fg_color, 0.1);
} }
&:active { &:active {
@extend %undecorated_button;
color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%)); color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
background-color: rgba($borders_color, 0.2); background-color: rgba($fg_color, 0.2);
} }
} }
} }

View File

@ -546,7 +546,7 @@
@mixin transition-shadows($color) { @mixin transition-shadows($color) {
> dimming { > dimming {
background: $color; background: none;
} }
> border { > border {

View File

@ -319,7 +319,8 @@ preferencesgroup > box {
// //
window.background { window.background {
> contents > toastoverlay > leaflet { > contents > toastoverlay > leaflet,
> widget > toastoverlay > leaflet { // 44.0
> box { > box {
background-color: $base_color; background-color: $base_color;
@ -354,7 +355,8 @@ window.background {
} }
&.maximized, &.tiled { &.maximized, &.tiled {
> contents > toastoverlay > leaflet { > contents > toastoverlay > leaflet,
> widget > toastoverlay > leaflet {
> box { > box {
> headerbar { > headerbar {
&, &:backdrop { &, &:backdrop {
@ -646,7 +648,7 @@ screenshot-carousel button,
padding: $container_padding / 2 $container_padding * 1.5; padding: $container_padding / 2 $container_padding * 1.5;
} }
.card flowboxchild.card { flowboxchild.card:not(.category-tile) {
padding: 0; padding: 0;
border: none; border: none;
box-shadow: none; box-shadow: none;

View File

@ -478,7 +478,7 @@ flap,
leaflet, leaflet,
navigation-view, navigation-view,
overlay-split-view { overlay-split-view {
@include transition-shadows($wm_shadow); @include transition-shadows($dark_borders_color);
} }
toolbarview.undershoot-top scrolledwindow { toolbarview.undershoot-top scrolledwindow {
@ -558,7 +558,7 @@ toolbarview.undershoot-bottom scrolledwindow {
leaflet, leaflet,
navigation-view, navigation-view,
overlay-split-view { overlay-split-view {
@include transition-shadows($wm_shadow); @include transition-shadows($dark_borders_color);
} }
banner > revealer > widget { banner > revealer > widget {
@ -628,7 +628,7 @@ toolbarview.undershoot-bottom scrolledwindow {
leaflet, leaflet,
navigation-view, navigation-view,
overlay-split-view { overlay-split-view {
@include transition-shadows($wm_shadow); @include transition-shadows($dark_borders_color);
} }
banner > revealer > widget { banner > revealer > widget {

View File

@ -413,6 +413,18 @@ window.background.csd {
} }
} }
notebook.tilix-background {
> header {
> tabs > tab {
button.tilix-small-button {
padding: 0; // not use ?
min-height: 16px;
min-width: 16px;
}
}
}
}
// //
// Lollypop // Lollypop
// //