diff options
Diffstat (limited to 'common/gtk-3.0')
28 files changed, 62 insertions, 54 deletions
diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 2ce4775..e7f5c21 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -283,9 +283,6 @@ 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 ea8c6ea..5c70d1c 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -282,9 +282,6 @@ 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 13af444..d3a212a 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -283,9 +283,6 @@ 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 ba00ae4..346b110 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -282,9 +282,6 @@ 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 387b7bf..a2ca2ad 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -282,9 +282,6 @@ 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 b504fdf..cd5f9d9 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -282,9 +282,6 @@ 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 b78af3b..5f98928 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -384,8 +384,6 @@ $_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 a36fd3f..c45621e 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -283,9 +283,6 @@ 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 54baadd..b42ea2c 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -282,9 +282,6 @@ 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 f49c484..99a4dc1 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -283,9 +283,6 @@ 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 4d9e252..a2154f2 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -282,9 +282,6 @@ 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 04fc939..a8238d1 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -282,9 +282,6 @@ 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 f89832f..c25fa18 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -282,9 +282,6 @@ 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 e7a4d53..200adc0 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -384,8 +384,6 @@ $_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 e50daf4..c0bc9ed 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -249,7 +249,7 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } - .button:active .label:insensitive, .button:checked .label:insensitive { + .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } .button:active { diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 6ef66bc..d75228a 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -248,7 +248,7 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } - .button:active .label:insensitive, .button:checked .label:insensitive { + .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } .button:active { 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 736d02d..33ceccc 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -249,7 +249,7 @@ GtkSearchEntry.entry { border-color: #2b2e39; background-color: #5294e2; transition-duration: 50ms; } - .button:active .label:insensitive, .button:checked .label:insensitive { + .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } .button:active { 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 210c2ab..bb8d873 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -248,7 +248,7 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } - .button:active .label:insensitive, .button:checked .label:insensitive { + .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } .button:active { diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 6ce867c..7a27856 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -248,7 +248,7 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } - .button:active .label:insensitive, .button:checked .label:insensitive { + .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } .button:active { diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index dc27169..782d1e1 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -248,7 +248,7 @@ GtkSearchEntry.entry { border-color: #5294e2; background-color: #5294e2; transition-duration: 50ms; } - .button:active .label:insensitive, .button:checked .label:insensitive { + .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } .button:active { diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index e215b31..86ae0b7 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -328,7 +328,7 @@ $_dot_color: $selected_bg_color; @include button(active); transition-duration: 50ms; - .label:insensitive { color: inherit; opacity: 0.6; } + &:not(:insensitive) .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 2780847..772ce2d 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -271,7 +271,7 @@ button { background-color: #5294e2; background-clip: padding-box; transition-duration: 50ms; } - button:active label:disabled, button:checked label:disabled { + button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } button:active { @@ -792,6 +792,10 @@ spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 #2b2e39; } +spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), +spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); } + spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), spinbutton:not(.vertical) > entry + button:not(:active):hover { @@ -1274,6 +1278,9 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } +.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 25dd5b3..ded7838 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -270,7 +270,7 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } - button:active label:disabled, button:checked label:disabled { + button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } button:active { @@ -791,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 #cfd6e6; } +spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), +spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); } + spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), spinbutton:not(.vertical) > entry + button:not(:active):hover { @@ -1273,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } +.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } 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 35e57af..4c6709c 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -271,7 +271,7 @@ button { background-color: #5294e2; background-clip: padding-box; transition-duration: 50ms; } - button:active label:disabled, button:checked label:disabled { + button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } button:active { @@ -792,6 +792,10 @@ spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 #2b2e39; } +spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), +spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); } + spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), spinbutton:not(.vertical) > entry + button:not(:active):hover { @@ -1274,6 +1278,9 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } +.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } 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 dfabb1f..5468bd7 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -270,7 +270,7 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } - button:active label:disabled, button:checked label:disabled { + button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } button:active { @@ -791,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 #cfd6e6; } +spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), +spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); } + spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), spinbutton:not(.vertical) > entry + button:not(:active):hover { @@ -1273,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } +.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index b443196..22457f2 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -270,7 +270,7 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } - button:active label:disabled, button:checked label:disabled { + button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } button:active { @@ -791,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 #cfd6e6; } +spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), +spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); } + spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), spinbutton:not(.vertical) > entry + button:not(:active):hover { @@ -1273,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } +.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 0bb60f0..bc3037d 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -270,7 +270,7 @@ button { background-color: #5294e2; background-clip: border-box; transition-duration: 50ms; } - button:active label:disabled, button:checked label:disabled { + button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } button:active { @@ -791,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 #cfd6e6; } +spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), +spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); } + spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), spinbutton:not(.vertical) > entry + button:not(:active):hover { @@ -1273,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button { box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } +.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index b361ab1..847c5c7 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -363,7 +363,7 @@ button { background-clip: if($variant=='light', border-box, padding-box); transition-duration: 50ms; - label:disabled { color: inherit; opacity: 0.6; } + &:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start @@ -809,6 +809,9 @@ spinbutton { > button:hover:not(:active), > button:hover + button { box-shadow: inset 1px 0 $button_border; } + > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), + > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: inset 1px 0 transparentize($button_border, 0.5); } + > button:first-child:hover:not(:active), > button.up:dir(rtl):hover:not(:active), > entry + button:not(:active):hover { box-shadow: none; } @@ -1302,6 +1305,9 @@ headerbar { > button:hover:not(:active), > button:hover + button { box-shadow: inset 1px 0 $header_button_border; } + > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), + > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: inset 1px 0 $header_button_border; } + > button:first-child:hover:not(:active), > entry + button:not(:active):hover { box-shadow: none; } |