luisgulo/WhiteSur-gtk-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
Vince 2021-12-06 13:37:42 +08:00
parent 2849962bb6
commit e7eb02fe3b
2 changed files with 108 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/sass/gtk/_common-3.0.scss
View file

@ -2412,7 +2412,7 @@ cursor-handle {
border: none; border: none;
transition: all 150ms ease-out; transition: all 150ms ease-out;
border-radius: $bt_radius; border-radius: $bt_radius;
padding: 0 $container_padding + 4px; 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%);
@ -2446,42 +2446,18 @@ notebook {
// Set margin to hide the ugly borders around the header // Set margin to hide the ugly borders around the header
&.top { &.top {
box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color; box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color;
// @if $variant=='light' {
// box-shadow: inset 0 1px $borders_color,
// inset 0 -1px $borders_color,
// 1px 0 $borders_color,
// -1px 0 $borders_color;
// }
} }
&.bottom { &.bottom {
box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color; box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color;
// @if $variant=='light' {
// box-shadow: inset 0 1px $borders_color,
// inset 0 -1px $borders_color,
// 1px 0 $borders_color,
// -1px 0 $borders_color;
// }
} }
&.right { &.right {
box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color; box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color;
// @if $variant=='light' {
// box-shadow: inset 1px 0 $borders_color,
// inset -1px 0 $borders_color,
// 0 1px $borders_color,
// 0 -1px $borders_color;
// }
} }
&.left { &.left {
box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color; box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color;
// @if $variant=='light' {
// box-shadow: inset 1px 0 $borders_color,
// inset -1px 0 $borders_color,
// 0 1px $borders_color,
// 0 -1px $borders_color;
// }
} }
} @else { } @else {
&.top { &.top {
@ -2502,12 +2478,17 @@ notebook {
} }
button.flat.toggle.popup { button.flat.toggle.popup {
min-width: $menuitem_size; min-width: $medium_size;
border: none; border: none;
box-shadow: none; box-shadow: none;
padding: 0;
margin-left: $container_padding / 2;
border-radius: $bt_radius; border-radius: $bt_radius;
padding: 0 $container_padding / 2;
@if $monterey == 'true' {
margin-top: -2px;
margin-bottom: -2px;
margin-left: $container_padding / 2;
}
&:active, &:checked { &:active, &:checked {
color: $fg_color; color: $fg_color;
@ -2624,6 +2605,8 @@ notebook {
min-width: 16px; min-width: 16px;
margin-top: 4px; margin-top: 4px;
margin-bottom: 4px; margin-bottom: 4px;
margin-left: $container_padding / 2;
margin-right: -$container_padding / 2;
} }
&:hover { &:hover {

172
src/sass/gtk/_common-4.0.scss
View file

@ -2306,6 +2306,8 @@ popover.menu {
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%);
@ -2326,7 +2328,7 @@ popover.menu {
border: none; border: none;
transition: all 150ms ease-out; transition: all 150ms ease-out;
border-radius: $bt_radius; border-radius: $bt_radius;
padding: 0 $container_padding + 4px; 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%);
@ -2341,11 +2343,8 @@ popover.menu {
notebook { notebook {
padding: 0; padding: 0;
// margin-top: -1px;
&.frame { &.frame { border: 1px solid $solid_borders_color; }
border: 1px solid $solid_borders_color;
}
> stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
background-color: $base_color; background-color: $base_color;
@ -2356,62 +2355,56 @@ notebook {
} }
> header { > header {
padding: 0; @if $monterey == 'false' {
background-color: darken($header_bg, 10%); background-color: darken($header_bg, 10%);
// Set box-shadow to make the header frame color more easy to see // Set box-shadow to make the header frame color more easy to see
// Set margin to hide the ugly borders around the header // Set margin to hide the ugly borders around the header
&.top { &.top {
box-shadow: inset 0 1px $solid_borders_color, inset 0 -1px $borders_color; box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color;
@if $variant=='light' {
box-shadow: inset 0 1px $borders_color,
inset 0 -1px $borders_color,
1px 0 $borders_color,
-1px 0 $borders_color;
} }
margin-top: -1px;
}
&.bottom { &.bottom {
box-shadow: inset 0 1px $borders_color, inset 0 -1px $solid_borders_color; box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color;
@if $variant=='light' {
box-shadow: inset 0 1px $borders_color,
inset 0 -1px $borders_color,
1px 0 $borders_color,
-1px 0 $borders_color;
} }
margin-bottom: -1px;
}
&.right { &.right {
box-shadow: inset 1px 0 $borders_color, inset -1px 0 $solid_borders_color; box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color;
@if $variant=='light' {
box-shadow: inset 1px 0 $borders_color,
inset -1px 0 $borders_color,
0 1px $borders_color,
0 -1px $borders_color;
} }
margin-right: -1px;
}
&.left { &.left {
box-shadow: inset 1px 0 $solid_borders_color, inset -1px 0 $borders_color; box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color;
@if $variant=='light' { }
box-shadow: inset 1px 0 $borders_color, } @else {
inset -1px 0 $borders_color, &.top {
0 1px $borders_color, border-bottom: 1px solid $borders_color;
0 -1px $borders_color; }
&.bottom {
border-top: 1px solid $borders_color;
}
&.right {
border-left: 1px solid $borders_color;
}
&.left {
border-right: 1px solid $borders_color;
} }
margin-left: -1px;
} }
button.flat.toggle.popup { button.flat.toggle.popup {
min-width: $menuitem_size; min-width: $medium_size;
border-radius: 0;
padding: 0;
border: none; border: none;
box-shadow: none; box-shadow: none;
margin: 0; border-radius: $bt_radius;
padding: 0 $container_padding / 2;
@if $monterey == 'true' {
margin-top: -2px;
margin-bottom: -2px;
margin-left: $container_padding / 2;
}
&:active, &:checked { &:active, &:checked {
color: $fg_color; color: $fg_color;
@ -2422,20 +2415,29 @@ notebook {
@each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) { @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) {
// sizing and borders // sizing and borders
&.#{$_pos} { &.#{$_pos} {
padding: 0; @if $monterey == 'false' {
margin-#{$_pos}: -1px;
padding: 0;
} @else {
padding: $container_padding / 2;
}
tab { > tabs > tab {
padding: $container_padding - 4px $container_padding + 4px; outline-offset: -4px;
min-width: 24px; min-width: 24px;
min-height: 24px; min-height: 24px;
border-radius: 0;
outline-offset: -4px;
// border-#{$_pos}: none;
// tab overlap @if $monterey == 'false' {
+ tab { // tab overlap
@if $_pos==top or $_pos==bottom { margin-left: -1px; } + tab {
@else { margin-top: -1px; } @if $_pos==top or $_pos==bottom { margin-left: -1px; }
@else { margin-top: -1px; }
}
} @else {
+ tab {
@if $_pos==top or $_pos==bottom { margin-left: $container_padding / 2; }
@else { margin-top: $container_padding / 2; }
}
} }
} }
} }
@ -2474,34 +2476,54 @@ notebook {
&:disabled { color: transparentize($disabled_fg_color,0.3); } &:disabled { color: transparentize($disabled_fg_color,0.3); }
} }
&.top, @if $monterey == 'false' {
&.bottom { &.top,
tabs > tab { &.bottom {
&:first-child { border-left-style: none; } > tabs > tab {
&:last-child { border-right-style: none; } &:first-child { border-left: none; }
&:last-child { border-right: none; }
}
} }
}
&.left, &.left,
&.right { &.right {
tabs > tab { > tabs > tab {
&:first-child { border-top-style: none; } &:first-child { border-top: none; }
&:last-child { border-bottom-style: none; } &:last-child { border-bottom: none; }
}
} }
} }
> tabs > tab { > tabs > tab {
@extend %tabs_tab; @if $monterey == 'false' {
@extend %tabs_tab;
} @else {
@extend %monterey_tab;
}
// close button // close button
button.flat { 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;
margin-left: $container_padding / 2;
margin-right: -$container_padding / 2;
}
&:hover { &:hover {
@extend %undecorated_button; @extend %undecorated_button;