Merge branch 'wip/jimmac/declare-buttonfill-once' into 'master'

Adwaita: double declated $button_fill

See merge request GNOME/gtk!2823
This commit is contained in:
Jakub Steiner 2020-11-13 16:57:18 +00:00
commit c648c1f235

View File

@ -1,9 +1,6 @@
// When color definition differs for dark and light variant // When color definition differs for dark and light variant
// it gets @if ed depending on $variant // it gets @if ed depending on $variant
// !global vars no longer in sass
$button_fill: null;
$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 100%), 2%)); $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 100%), 2%));
$text_color: if($variant == 'light', black, white); $text_color: if($variant == 'light', black, white);
$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%)); $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));