Chillcraft/Colloid-gtk-theme
3
0
Fork 0
mirror of https://github.com/vinceliuice/Colloid-gtk-theme.git synced 2025-09-16 05:18:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
vinceliuice
2022-10-10 13:45:44 +08:00
parent 5feeded9ac
commit ac2053c721
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sass/gtk/_common-4.0.scss
View File

@@ -478,7 +478,7 @@ button {
@at-root %button-flat-simple, & { @at-root %button-flat-simple, & {
@include button(flat-normal); @include button(flat-normal);
&:focus { @include button(flat-focus); } &:focus:not(:hover):not(:active) { @include button(flat-focus); }
&:hover { @include button(flat-hover); } &:hover { @include button(flat-hover); }
@@ -487,7 +487,7 @@ button {
&:disabled { @include button(flat-disabled); } &:disabled { @include button(flat-disabled); }
} }
&:checked, &:checked:hover { @include button(flat-checked); } &:checked, &:checked:hover, &:checked:focus { @include button(flat-checked); }
&:checked:disabled { @include button(flat-checked-disabled); } &:checked:disabled { @include button(flat-checked-disabled); }
} }
@@ -1446,7 +1446,8 @@ headerbar {
background-color: $titlebar; background-color: $titlebar;
color: $titlebar-text; color: $titlebar-text;
min-height: $large-size; min-height: $large-size;
padding: 0 $space-size; padding: 0;
margin: 0;
&:disabled { color: $titlebar-text-disabled; } &:disabled { color: $titlebar-text-disabled; }
@@ -1493,7 +1494,7 @@ headerbar {
} }
> windowhandle > box { > windowhandle > box {
padding: 0 $space-size / 2; padding: 0 $space-size;
&, &,
> box.start, > box.start,
@@ -1659,6 +1660,8 @@ pathbar > button {
padding-right: ($medium-size - 24px) / 2; padding-right: ($medium-size - 24px) / 2;
border-radius: $corner-radius; border-radius: $corner-radius;
background-color: $overlay-focus; background-color: $overlay-focus;
border: none;
box-shadow: none;
&:disabled { background-color: $overlay-normal; } &:disabled { background-color: $overlay-normal; }
@@ -1697,6 +1700,12 @@ pathbar > button {
margin-bottom: 0; margin-bottom: 0;
min-height: 20px; min-height: 20px;
border-radius: $corner-radius - 2px; border-radius: $corner-radius - 2px;
border: none;
box-shadow: none;
&:last-child {
@include button(flat-checked);
}
} }
} }
@@ -4482,7 +4491,7 @@ window {
} }
} }
$window-space: if($window_button == 'mac', $space-size, $space-size - 2px); $window-space: if($window_button == 'mac', $space-size * 1.5, $space-size);
windowcontrols { windowcontrols {
border-spacing: $space-size; border-spacing: $space-size;

7
src/sass/gtk/_drawing-4.0.scss
View File

@@ -125,12 +125,13 @@
@if $t == flat-hover { @if $t == flat-hover {
background-color: $overlay-hover; background-color: $overlay-hover;
color: $text; color: $text;
box-shadow: none;
} }
@if $t == flat-focus { @if $t == flat-focus {
background-color: $overlay-focus; background-color: transparent;
color: $text; color: $text;
box-shadow: none; box-shadow: inset 0 0 0 2px $fill;
} }
@if $t == flat-active { @if $t == flat-active {
@@ -138,6 +139,7 @@
background-color $ripple-fade-in-duration $ease-out; background-color $ripple-fade-in-duration $ease-out;
background-color: $overlay-active; background-color: $overlay-active;
color: $text; color: $text;
box-shadow: none;
} }
@if $t == flat-disabled { @if $t == flat-disabled {
@@ -147,6 +149,7 @@
@if $t == flat-checked { @if $t == flat-checked {
background-color: $overlay-checked; background-color: $overlay-checked;
color: $text; color: $text;
box-shadow: none;
} }
@if $t == flat-checked-disabled { @if $t == flat-checked-disabled {