diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss index a6e94b8..612db54 100644 --- a/src/_sass/gtk/_common-4.0.scss +++ b/src/_sass/gtk/_common-4.0.scss @@ -1191,7 +1191,8 @@ headerbar { @extend %titlebar-button; } - button.suggested-action, button.destructive-action { + button.suggested-action, + button.destructive-action { &:disabled { background-color: $titlebar-fill; color: $titlebar-text-disabled; diff --git a/src/_sass/gtk/_drawing-4.0.scss b/src/_sass/gtk/_drawing-4.0.scss index 9c9f882..e4f7fa8 100644 --- a/src/_sass/gtk/_drawing-4.0.scss +++ b/src/_sass/gtk/_drawing-4.0.scss @@ -135,8 +135,6 @@ color: $text-disabled; filter: none; opacity: 1; - - > label { color: $text-disabled; } } @if $t == checked { diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css index dfa131b..74d096c 100644 --- a/src/gtk/4.0/gtk-Compact.css +++ b/src/gtk/4.0/gtk-Compact.css @@ -624,10 +624,6 @@ headerbar popover.background button:disabled:not(.suggested-action):not(.destruc opacity: 1; } -headerbar popover.background button:disabled:not(.suggested-action):not(.destructive-action) > label, button:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - headerbar popover.background button:checked:not(.suggested-action):not(.destructive-action), button:checked { box-shadow: none; background-color: #1A73E8; @@ -833,10 +829,6 @@ button.suggested-action:disabled { opacity: 1; } -button.suggested-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.suggested-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(26, 115, 232, 0.2), 0 4px 3px 0 rgba(26, 115, 232, 0.14), 0 1px 6px 0 rgba(26, 115, 232, 0.12); } @@ -882,10 +874,6 @@ button.destructive-action:disabled { opacity: 1; } -button.destructive-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.destructive-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(217, 48, 37, 0.2), 0 4px 3px 0 rgba(217, 48, 37, 0.14), 0 1px 6px 0 rgba(217, 48, 37, 0.12); } @@ -1310,10 +1298,6 @@ button.combo:only-child:disabled { opacity: 1; } -button.combo:only-child:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - .app-notification, .toolbar.osd, toolbar.osd { transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1584,7 +1568,8 @@ headerbar .linked:not(.vertical) > entry:not(:only-child) { border-radius: 10px; } -headerbar button.suggested-action:disabled, headerbar button.destructive-action:disabled { +headerbar button.suggested-action:disabled, +headerbar button.destructive-action:disabled { background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.5); } diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css index d5761a7..5cac4c1 100644 --- a/src/gtk/4.0/gtk-Dark-Compact.css +++ b/src/gtk/4.0/gtk-Dark-Compact.css @@ -624,10 +624,6 @@ headerbar popover.background button:disabled:not(.suggested-action):not(.destruc opacity: 1; } -headerbar popover.background button:disabled:not(.suggested-action):not(.destructive-action) > label, button:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - headerbar popover.background button:checked:not(.suggested-action):not(.destructive-action), button:checked { box-shadow: none; background-color: #3281EA; @@ -833,10 +829,6 @@ button.suggested-action:disabled { opacity: 1; } -button.suggested-action:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - button.suggested-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(50, 129, 234, 0.2), 0 4px 3px 0 rgba(50, 129, 234, 0.14), 0 1px 6px 0 rgba(50, 129, 234, 0.12); } @@ -882,10 +874,6 @@ button.destructive-action:disabled { opacity: 1; } -button.destructive-action:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - button.destructive-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(242, 139, 130, 0.2), 0 4px 3px 0 rgba(242, 139, 130, 0.14), 0 1px 6px 0 rgba(242, 139, 130, 0.12); } @@ -1310,10 +1298,6 @@ button.combo:only-child:disabled { opacity: 1; } -button.combo:only-child:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - .app-notification, .toolbar.osd, toolbar.osd { transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1584,7 +1568,8 @@ headerbar .linked:not(.vertical) > entry:not(:only-child) { border-radius: 10px; } -headerbar button.suggested-action:disabled, headerbar button.destructive-action:disabled { +headerbar button.suggested-action:disabled, +headerbar button.destructive-action:disabled { background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.5); } diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css index 1d755d3..1bdb2cf 100644 --- a/src/gtk/4.0/gtk-Dark.css +++ b/src/gtk/4.0/gtk-Dark.css @@ -624,10 +624,6 @@ headerbar popover.background button:disabled:not(.suggested-action):not(.destruc opacity: 1; } -headerbar popover.background button:disabled:not(.suggested-action):not(.destructive-action) > label, button:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - headerbar popover.background button:checked:not(.suggested-action):not(.destructive-action), button:checked { box-shadow: none; background-color: #3281EA; @@ -833,10 +829,6 @@ button.suggested-action:disabled { opacity: 1; } -button.suggested-action:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - button.suggested-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(50, 129, 234, 0.2), 0 4px 3px 0 rgba(50, 129, 234, 0.14), 0 1px 6px 0 rgba(50, 129, 234, 0.12); } @@ -882,10 +874,6 @@ button.destructive-action:disabled { opacity: 1; } -button.destructive-action:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - button.destructive-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(242, 139, 130, 0.2), 0 4px 3px 0 rgba(242, 139, 130, 0.14), 0 1px 6px 0 rgba(242, 139, 130, 0.12); } @@ -1310,10 +1298,6 @@ button.combo:only-child:disabled { opacity: 1; } -button.combo:only-child:disabled > label { - color: rgba(255, 255, 255, 0.5); -} - .app-notification, .toolbar.osd, toolbar.osd { transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1584,7 +1568,8 @@ headerbar .linked:not(.vertical) > entry:not(:only-child) { border-radius: 12px; } -headerbar button.suggested-action:disabled, headerbar button.destructive-action:disabled { +headerbar button.suggested-action:disabled, +headerbar button.destructive-action:disabled { background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.5); } diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css index ce8e289..a8edb2d 100644 --- a/src/gtk/4.0/gtk-Light-Compact.css +++ b/src/gtk/4.0/gtk-Light-Compact.css @@ -624,10 +624,6 @@ headerbar popover.background button:disabled:not(.suggested-action):not(.destruc opacity: 1; } -headerbar popover.background button:disabled:not(.suggested-action):not(.destructive-action) > label, button:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - headerbar popover.background button:checked:not(.suggested-action):not(.destructive-action), button:checked { box-shadow: none; background-color: #1A73E8; @@ -833,10 +829,6 @@ button.suggested-action:disabled { opacity: 1; } -button.suggested-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.suggested-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(26, 115, 232, 0.2), 0 4px 3px 0 rgba(26, 115, 232, 0.14), 0 1px 6px 0 rgba(26, 115, 232, 0.12); } @@ -882,10 +874,6 @@ button.destructive-action:disabled { opacity: 1; } -button.destructive-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.destructive-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(217, 48, 37, 0.2), 0 4px 3px 0 rgba(217, 48, 37, 0.14), 0 1px 6px 0 rgba(217, 48, 37, 0.12); } @@ -1310,10 +1298,6 @@ button.combo:only-child:disabled { opacity: 1; } -button.combo:only-child:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - .app-notification, .toolbar.osd, toolbar.osd { transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1584,7 +1568,8 @@ headerbar .linked:not(.vertical) > entry:not(:only-child) { border-radius: 10px; } -headerbar button.suggested-action:disabled, headerbar button.destructive-action:disabled { +headerbar button.suggested-action:disabled, +headerbar button.destructive-action:disabled { background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.38); } diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css index 08cb4d6..248038f 100644 --- a/src/gtk/4.0/gtk-Light.css +++ b/src/gtk/4.0/gtk-Light.css @@ -624,10 +624,6 @@ headerbar popover.background button:disabled:not(.suggested-action):not(.destruc opacity: 1; } -headerbar popover.background button:disabled:not(.suggested-action):not(.destructive-action) > label, button:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - headerbar popover.background button:checked:not(.suggested-action):not(.destructive-action), button:checked { box-shadow: none; background-color: #1A73E8; @@ -833,10 +829,6 @@ button.suggested-action:disabled { opacity: 1; } -button.suggested-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.suggested-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(26, 115, 232, 0.2), 0 4px 3px 0 rgba(26, 115, 232, 0.14), 0 1px 6px 0 rgba(26, 115, 232, 0.12); } @@ -882,10 +874,6 @@ button.destructive-action:disabled { opacity: 1; } -button.destructive-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.destructive-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(217, 48, 37, 0.2), 0 4px 3px 0 rgba(217, 48, 37, 0.14), 0 1px 6px 0 rgba(217, 48, 37, 0.12); } @@ -1310,10 +1298,6 @@ button.combo:only-child:disabled { opacity: 1; } -button.combo:only-child:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - .app-notification, .toolbar.osd, toolbar.osd { transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1584,7 +1568,8 @@ headerbar .linked:not(.vertical) > entry:not(:only-child) { border-radius: 12px; } -headerbar button.suggested-action:disabled, headerbar button.destructive-action:disabled { +headerbar button.suggested-action:disabled, +headerbar button.destructive-action:disabled { background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.38); } diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css index 1ef19c2..6213f13 100644 --- a/src/gtk/4.0/gtk.css +++ b/src/gtk/4.0/gtk.css @@ -624,10 +624,6 @@ headerbar popover.background button:disabled:not(.suggested-action):not(.destruc opacity: 1; } -headerbar popover.background button:disabled:not(.suggested-action):not(.destructive-action) > label, button:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - headerbar popover.background button:checked:not(.suggested-action):not(.destructive-action), button:checked { box-shadow: none; background-color: #1A73E8; @@ -833,10 +829,6 @@ button.suggested-action:disabled { opacity: 1; } -button.suggested-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.suggested-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(26, 115, 232, 0.2), 0 4px 3px 0 rgba(26, 115, 232, 0.14), 0 1px 6px 0 rgba(26, 115, 232, 0.12); } @@ -882,10 +874,6 @@ button.destructive-action:disabled { opacity: 1; } -button.destructive-action:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - button.destructive-action:hover { box-shadow: inset 0 0 0 9999px transparent, 0 2px 2.4px -1px rgba(217, 48, 37, 0.2), 0 4px 3px 0 rgba(217, 48, 37, 0.14), 0 1px 6px 0 rgba(217, 48, 37, 0.12); } @@ -1310,10 +1298,6 @@ button.combo:only-child:disabled { opacity: 1; } -button.combo:only-child:disabled > label { - color: rgba(0, 0, 0, 0.38); -} - .app-notification, .toolbar.osd, toolbar.osd { transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1584,7 +1568,8 @@ headerbar .linked:not(.vertical) > entry:not(:only-child) { border-radius: 12px; } -headerbar button.suggested-action:disabled, headerbar button.destructive-action:disabled { +headerbar button.suggested-action:disabled, +headerbar button.destructive-action:disabled { background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.5); }