diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-04-15 11:12:28 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-15 11:12:28 +0000 |
commit | eb3df6a2e889f5793423a38ec71261d6e31c85ec (patch) | |
tree | ac3cfd9dee1b390c1723409857475ea1e890aca6 | |
parent | d1d009b4918fc4cac6b8c72c4a580e4302a627d3 (diff) | |
parent | c6483d431f1c18a371da8f7f79d049235468731e (diff) | |
download | gtk+-eb3df6a2e889f5793423a38ec71261d6e31c85ec.tar.gz |
Merge branch 'theme-icon-filter-fixes' into 'master'
theme: Use -gtk-icon-filter for full-color icons
See merge request GNOME/gtk!1990
-rw-r--r-- | gtk/theme/Default/_common.scss | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gtk/theme/Default/_common.scss b/gtk/theme/Default/_common.scss index 9b44517af5..83692f5e97 100644 --- a/gtk/theme/Default/_common.scss +++ b/gtk/theme/Default/_common.scss @@ -39,19 +39,9 @@ dnd { -gtk-icon-size: 32px; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Every time a wildcard is used a kitten dies, painfully. -*/ - -spinner:disabled, -arrow:disabled, -scrollbar:disabled, -check:disabled, -radio:disabled, -treeview.expander:disabled { -gtk-icon-filter: opacity(0.5); } +image:disabled { + -gtk-icon-filter: opacity(0.5); +} .view, %view { @@ -509,7 +499,8 @@ button { @include button(backdrop); transition: $backdrop_transition; - -gtk-icon-filter: none; + + &:not(:disabled) { -gtk-icon-filter: none; } &:active, &:checked { @include button(backdrop-active); } @@ -525,6 +516,7 @@ button { &:disabled { @include button(insensitive); + -gtk-icon-filter: opacity(0.5); &:active, &:checked { @include button(insensitive-active); } |