This commit is contained in:
Vince 2021-07-28 17:12:27 +08:00
parent 3fbce8abfa
commit d48a1aff01
2 changed files with 56 additions and 33 deletions

View File

@ -2382,6 +2382,8 @@ cursor-handle {
background-color: transparentize($base_color, 1); background-color: transparentize($base_color, 1);
border: 1px solid transparent; border: 1px solid transparent;
transition: all 150ms ease-out; transition: all 150ms ease-out;
border-radius: 0;
padding: $container_padding - 4px $container_padding + 4px;
&:hover:not(:checked) { &:hover:not(:checked) {
color: mix($fg_color, $disabled_fg_color, 50%); color: mix($fg_color, $disabled_fg_color, 50%);
@ -2401,7 +2403,8 @@ cursor-handle {
background-color: transparentize($base_color, 1); background-color: transparentize($base_color, 1);
border: none; border: none;
transition: all 150ms ease-out; transition: all 150ms ease-out;
padding: 0 0; border-radius: $bt_radius;
padding: 0 $container_padding + 4px;
&:hover:not(:checked) { &:hover:not(:checked) {
color: mix($fg_color, $disabled_fg_color, 50%); color: mix($fg_color, $disabled_fg_color, 50%);
@ -2494,10 +2497,10 @@ notebook {
min-width: $menuitem_size; min-width: $menuitem_size;
border: none; border: none;
box-shadow: none; box-shadow: none;
padding: 0;
@if $monterey == 'false' { @if $monterey == 'false' {
border-radius: 0; border-radius: 0;
padding: 0;
margin: 0; margin: 0;
} @else { } @else {
margin-left: $container_padding / 2; margin-left: $container_padding / 2;
@ -2521,22 +2524,17 @@ notebook {
} }
> tabs > tab { > tabs > tab {
padding: $container_padding - 4px $container_padding + 4px;
outline-offset: -4px; outline-offset: -4px;
min-width: 24px; min-width: 24px;
min-height: 24px; min-height: 24px;
@if $monterey == 'false' { @if $monterey == 'false' {
border-radius: 0;
// tab overlap // tab overlap
+ tab { + tab {
@if $_pos==top or $_pos==bottom { margin-left: -1px; } @if $_pos==top or $_pos==bottom { margin-left: -1px; }
@else { margin-top: -1px; } @else { margin-top: -1px; }
} }
} @else { } @else {
border-radius: $bt_radius;
+ tab { + tab {
@if $_pos==top or $_pos==bottom { margin-left: $container_padding / 2; } @if $_pos==top or $_pos==bottom { margin-left: $container_padding / 2; }
@else { margin-top: $container_padding / 2; } @else { margin-top: $container_padding / 2; }
@ -2605,14 +2603,26 @@ notebook {
} }
// close button // close button
button.flat, button.close-button { button.flat,
min-height: $small_size; button.close-button,
min-width: $small_size; button.image-button.flat {
border-radius: 3px; border-radius: 3px;
padding: 0; padding: 0;
margin-top: 2px;
margin-bottom: 2px;
color: mix($bg_color, $fg_color, 35%); color: mix($bg_color, $fg_color, 35%);
margin-left: $container_padding / 2;
margin-right: -$container_padding;
@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;
}
&:hover { &:hover {
@extend %undecorated_button; @extend %undecorated_button;

View File

@ -595,18 +595,12 @@ terminal-window {
notebook { notebook {
button.flat.toggle.popup { button.flat.toggle.popup {
min-height: 28px;
min-width: 28px;
padding: 0;
@if $monterey == 'false' { @if $monterey == 'false' {
margin: -2px; margin: -2px;
} @else { } @else {
margin: -2px 0; margin: -2px 0;
} }
} }
tab { padding: 0 0; }
} }
&.background.csd.maximized { border-radius: 0 0 0 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization &.background.csd.maximized { border-radius: 0 0 0 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization
@ -1962,29 +1956,48 @@ window.background.csd {
} }
tabbox { tabbox {
background-color: darken($header_bg, 10%); @if $monterey == 'false' {
box-shadow: inset 0 -1px $borders_color; background-color: darken($header_bg, 10%);
box-shadow: inset 0 -1px $borders_color;
} @else {
background-color: $header_bg;
border-bottom: 1px solid $borders_color;
padding: 0 $container_padding / 2 $container_padding / 2;
}
> tab { > tab {
@extend %tabs_tab; @if $monterey == 'false' {
border-top: none; @extend %tabs_tab;
padding: 2px 10px; border-top: none;
min-width: 24px; border-top: 1px solid $borders_color;
min-height: 24px; &:checked { border-top-color: $header_bg; }
border-top: 1px solid $borders_color; } @else {
@extend %monterey_tab;
&:checked { + tab {
border-top-color: $header_bg; margin-left: $container_padding / 2;
}
} }
button { button.tab-close-button {
min-height: 20px;
min-width: 20px;
border-radius: 3px; border-radius: 3px;
border: none; border: none;
padding: 0; padding: 0;
@extend %flat_button; @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;
}
&:hover { &:hover {
color: $fg_color; color: $fg_color;
background-color: rgba($borders_color, 0.1); background-color: rgba($borders_color, 0.1);
@ -2451,7 +2464,7 @@ window.background.csd {
// //
// Archive Manager // Archive Manager
// //
.background.csd { window.background.csd {
> grid.horizontal > paned.horizontal { > grid.horizontal > paned.horizontal {
> scrolledwindow { > scrolledwindow {
border-radius: 0 0 $wm_radius $wm_radius; border-radius: 0 0 $wm_radius $wm_radius;
@ -2492,7 +2505,7 @@ window.background.csd {
// //
// Eye of GNOME Image Viewer // Eye of GNOME Image Viewer
// //
.background.csd { window.background.csd {
> box.vertical > box.vertical > box.vertical{ > box.vertical > box.vertical > box.vertical{
> paned.horizontal { > paned.horizontal {
> separator { > separator {