Merge branch 'wip/jimmac/flat-button-tweaks' into 'master'

Adwaita: flat button adjustments

See merge request GNOME/gtk!2967
This commit is contained in:
Matthias Clasen
2020-12-17 12:52:22 +00:00
2 changed files with 7 additions and 5 deletions

View File

@@ -536,7 +536,8 @@ button {
transition: $button_transition;
transition-duration: 500ms;
}
&:active {
&:active,
&:checked {
@include button(undecorated-active);
transition: $button_transition;
}
@@ -1396,9 +1397,10 @@ windowcontrols {
min-height: 0;
&:hover {
//special case hover colors inside a headerbar
@include button(undecorated-hover,$c:$headerbar_bg_color);
@include button(undecorated-hover,$c:darken($headerbar_bg_color,10%));
}
&:active { @include button(undecorated-active,$c:$headerbar_bg_color); }
&:active,
&:checked { @include button(undecorated-active,$c:darken($headerbar_bg_color,10%)); }
}
}

View File

@@ -419,7 +419,7 @@
box-shadow: none;
text-shadow: none;
@if $variant == 'light' {
background-color: darken($c,26%);
background-color: darken($c,14%);
}
@else {
background-color: darken($c,10%);
@@ -431,7 +431,7 @@
box-shadow: none;
text-shadow: none;
@if $variant == 'light' {
background-color: darken($c,40%);
background-color: darken($c,30%);
}
@else {
background-color: darken($c,14%);