Fixed issues

This commit is contained in:
vinceliuice 2022-01-30 13:12:53 +08:00
parent f4f1d0acde
commit aee637dea4
2 changed files with 34 additions and 20 deletions

View File

@ -652,8 +652,8 @@ $_dot_color: $selected_bg_color;
%flat_button {
@include button(flat-normal);
&:hover { @include button(flat-hover); }
&:active { @include button(flat-active); }
&:checked { @include button(flat-checked); }
&:active, &:active:hover { @include button(flat-active); }
&:checked, &:checked:hover { @include button(flat-checked); }
&:disabled { @include button(flat-insensitive); }
}
@ -688,8 +688,6 @@ button {
&:active { transition: $button_transition; }
}
&:checked:hover { background-image: none; }
&.toggle.popup:not(.colored) {
min-width: $menuitem_size - 8px;
}
@ -727,6 +725,18 @@ button {
}
}
.background &.flat { // reset
&: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;
padding-left: $container_padding;

View File

@ -1961,7 +1961,7 @@ window.background.csd {
}
}
tabbox {
.background tabbox {
@if $monterey == 'false' {
background-color: darken($header_bg, 10%);
box-shadow: inset 0 -1px $borders_color;
@ -1985,24 +1985,13 @@ tabbox {
}
}
button.tab-close-button {
button {
@extend %flat_button;
border-radius: 3px;
border: none;
padding: 0;
@extend %flat_button;
@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-right: -$container_padding;
}
min-height: $small_size;
min-width: $small_size;
&:hover {
color: $fg_color;
@ -2013,6 +2002,21 @@ tabbox {
color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
background-color: rgba($borders_color, 0.2);
}
&.tab-close-button {
@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-right: -$container_padding;
}
}
}
}
}