From 97d96272f05eb9692203cea422d70af739bb154d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 20 Sep 2016 21:09:23 +0200 Subject: fix color of disabled labels in checked buttons --- common/gtk-3.0/3.14/gtk-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-solid-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-solid-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-solid.css | 3 +++ common/gtk-3.0/3.14/gtk.css | 3 +++ common/gtk-3.0/3.14/sass/_common.scss | 2 ++ common/gtk-3.0/3.16/gtk-dark.css | 3 +++ common/gtk-3.0/3.16/gtk-darker.css | 3 +++ common/gtk-3.0/3.16/gtk-solid-dark.css | 3 +++ common/gtk-3.0/3.16/gtk-solid-darker.css | 3 +++ common/gtk-3.0/3.16/gtk-solid.css | 3 +++ common/gtk-3.0/3.16/gtk.css | 3 +++ common/gtk-3.0/3.16/sass/_common.scss | 2 ++ common/gtk-3.0/3.18/gtk-dark.css | 3 +++ common/gtk-3.0/3.18/gtk-darker.css | 3 +++ common/gtk-3.0/3.18/gtk-solid-dark.css | 3 +++ common/gtk-3.0/3.18/gtk-solid-darker.css | 3 +++ common/gtk-3.0/3.18/gtk-solid.css | 3 +++ common/gtk-3.0/3.18/gtk.css | 3 +++ common/gtk-3.0/3.18/sass/_common.scss | 2 ++ common/gtk-3.0/3.20/gtk-dark.css | 3 +++ common/gtk-3.0/3.20/gtk-darker.css | 3 +++ common/gtk-3.0/3.20/gtk-solid-dark.css | 3 +++ common/gtk-3.0/3.20/gtk-solid-darker.css | 3 +++ common/gtk-3.0/3.20/gtk-solid.css | 3 +++ common/gtk-3.0/3.20/gtk.css | 3 +++ common/gtk-3.0/3.20/sass/_common.scss | 2 ++ 28 files changed, 80 insertions(+) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index e7f5c21..2ce4775 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -283,6 +283,9 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #D3DAE3; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 5c70d1c..ea8c6ea 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index d3a212a..13af444 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -283,6 +283,9 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #D3DAE3; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 346b110..ba00ae4 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index a2ca2ad..387b7bf 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index cd5f9d9..b504fdf 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 5f98928..b78af3b 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -384,6 +384,8 @@ $_dot_color: $selected_bg_color; background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; + + .label:insensitive { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index c45621e..a36fd3f 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -283,6 +283,9 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #D3DAE3; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index b42ea2c..54baadd 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 99a4dc1..f49c484 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -283,6 +283,9 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #D3DAE3; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index a2154f2..4d9e252 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index a8238d1..04fc939 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index c25fa18..f89832f 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -282,6 +282,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 200adc0..e7a4d53 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -384,6 +384,8 @@ $_dot_color: $selected_bg_color; background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; + + .label:insensitive { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 0556032..e50daf4 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -249,6 +249,9 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #D3DAE3; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 37915c4..6ef66bc 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -248,6 +248,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index d9716bd..736d02d 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -249,6 +249,9 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #D3DAE3; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 4b77834..210c2ab 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -248,6 +248,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index c7d9f25..6ce867c 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -248,6 +248,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 1e53899..dc27169 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -248,6 +248,9 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } + .button:active .label:insensitive, .button:checked .label:insensitive { + color: inherit; + opacity: 0.6; } .button:active { color: #5c616c; } .button:active:hover, .button:checked { diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index d60f175..e215b31 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -327,6 +327,8 @@ $_dot_color: $selected_bg_color; background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; + + .label:insensitive { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 63e3e4b..2780847 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -271,6 +271,9 @@ button { background-color: #5294e2; background-clip: padding-box; transition-duration: 50ms; } + button:active label:disabled, button:checked label:disabled { + color: inherit; + opacity: 0.6; } button:active { color: #D3DAE3; } button:active:hover, button:checked { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 8ee4e4e..25dd5b3 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -270,6 +270,9 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } + button:active label:disabled, button:checked label:disabled { + color: inherit; + opacity: 0.6; } button:active { color: #5c616c; } button:active:hover, button:checked { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 6cc3be6..35e57af 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -271,6 +271,9 @@ button { background-color: #5294e2; background-clip: padding-box; transition-duration: 50ms; } + button:active label:disabled, button:checked label:disabled { + color: inherit; + opacity: 0.6; } button:active { color: #D3DAE3; } button:active:hover, button:checked { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 78ef016..dfabb1f 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -270,6 +270,9 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } + button:active label:disabled, button:checked label:disabled { + color: inherit; + opacity: 0.6; } button:active { color: #5c616c; } button:active:hover, button:checked { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index dc7fb6b..b443196 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -270,6 +270,9 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } + button:active label:disabled, button:checked label:disabled { + color: inherit; + opacity: 0.6; } button:active { color: #5c616c; } button:active:hover, button:checked { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 0cadf30..0bb60f0 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -270,6 +270,9 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } + button:active label:disabled, button:checked label:disabled { + color: inherit; + opacity: 0.6; } button:active { color: #5c616c; } button:active:hover, button:checked { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 9d27a68..b361ab1 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -362,6 +362,8 @@ button { background-clip: if($variant=='light', border-box, padding-box); transition-duration: 50ms; + + label:disabled { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start -- cgit v1.2.3