From bc6555a5a86aa96a0d44d0a5076873ce4106c2f2 Mon Sep 17 00:00:00 2001 From: lassekongo83 Date: Mon, 2 Dec 2019 16:13:58 +0100 Subject: [PATCH] Fix disabled flat buttons --- gtk/src/Zukitre/gtk-3.0/_common.scss | 1 + gtk/src/Zukitre/gtk-3.0/gtk-dark.css | 2 +- gtk/src/Zukitre/gtk-3.0/gtk.css | 2 +- gtk/src/Zukitwo/gtk-3.0/_common.scss | 1 + gtk/src/Zukitwo/gtk-3.0/gtk-dark.css | 2 +- gtk/src/Zukitwo/gtk-3.0/gtk.css | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/src/Zukitre/gtk-3.0/_common.scss b/gtk/src/Zukitre/gtk-3.0/_common.scss index 8421b7e..9e350b3 100644 --- a/gtk/src/Zukitre/gtk-3.0/_common.scss +++ b/gtk/src/Zukitre/gtk-3.0/_common.scss @@ -506,6 +506,7 @@ button { @include button(active); } + @at-root %button_basic_flat, &.flat { &:disabled { @include button(undecorated); }} &:disabled { diff --git a/gtk/src/Zukitre/gtk-3.0/gtk-dark.css b/gtk/src/Zukitre/gtk-3.0/gtk-dark.css index f97d3a6..7a6b061 100644 --- a/gtk/src/Zukitre/gtk-3.0/gtk-dark.css +++ b/gtk/src/Zukitre/gtk-3.0/gtk-dark.css @@ -185,7 +185,7 @@ notebook > header > tabs > arrow:active:hover, notebook > header > tabs > arrow: notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #f6f6f7; outline-color: rgba(246, 246, 247, 0.3); background-color: #1d1f20; box-shadow: inset 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px rgba(0, 0, 0, 0.08), inset -1px 0 rgba(0, 0, 0, 0.08), inset 0 -1px rgba(0, 0, 0, 0.08); border-color: black; border-top-color: black; } -notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(246, 246, 247, 0); text-shadow: none; -gtk-icon-shadow: none; } +notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(246, 246, 247, 0); text-shadow: none; -gtk-icon-shadow: none; } notebook > header > tabs > arrow:disabled, button:disabled { color: #919294; box-shadow: none; border-color: #121517; background-color: #303335; text-shadow: none; -gtk-icon-shadow: none; } diff --git a/gtk/src/Zukitre/gtk-3.0/gtk.css b/gtk/src/Zukitre/gtk-3.0/gtk.css index 5398ba9..11a34bf 100644 --- a/gtk/src/Zukitre/gtk-3.0/gtk.css +++ b/gtk/src/Zukitre/gtk-3.0/gtk.css @@ -185,7 +185,7 @@ notebook > header > tabs > arrow:active:hover, notebook > header > tabs > arrow: notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #2c2c2c; outline-color: rgba(44, 44, 44, 0.3); background-color: #b7b7b7; box-shadow: inset 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px rgba(0, 0, 0, 0.08), inset -1px 0 rgba(0, 0, 0, 0.08), inset 0 -1px rgba(0, 0, 0, 0.08); border-color: #919191; border-top-color: #787878; } -notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } +notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } notebook > header > tabs > arrow:disabled, button:disabled { color: #818181; box-shadow: none; border-color: #b0b0b0; background-color: #e3e3e3; text-shadow: none; -gtk-icon-shadow: none; } diff --git a/gtk/src/Zukitwo/gtk-3.0/_common.scss b/gtk/src/Zukitwo/gtk-3.0/_common.scss index bbedd8f..1db6bd1 100644 --- a/gtk/src/Zukitwo/gtk-3.0/_common.scss +++ b/gtk/src/Zukitwo/gtk-3.0/_common.scss @@ -506,6 +506,7 @@ button { @include button(active); } + @at-root %button_basic_flat, &.flat { &:disabled { @include button(undecorated); }} &:disabled { diff --git a/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css b/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css index 060958c..958745a 100644 --- a/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css +++ b/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css @@ -185,7 +185,7 @@ notebook > header > tabs > arrow:active:hover, notebook > header > tabs > arrow: notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #f6f6f7; outline-color: rgba(246, 246, 247, 0.3); background-image: linear-gradient(to bottom, #151718, #1f2123); box-shadow: inset 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px rgba(0, 0, 0, 0.08), inset -1px 0 rgba(0, 0, 0, 0.08), inset 0 -1px rgba(0, 0, 0, 0.08); border-color: black; border-top-color: black; } -notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(246, 246, 247, 0); text-shadow: none; -gtk-icon-shadow: none; } +notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(246, 246, 247, 0); text-shadow: none; -gtk-icon-shadow: none; } notebook > header > tabs > arrow:disabled, button:disabled { color: #919294; box-shadow: none; border-color: #121517; background-color: #303335; text-shadow: none; -gtk-icon-shadow: none; } diff --git a/gtk/src/Zukitwo/gtk-3.0/gtk.css b/gtk/src/Zukitwo/gtk-3.0/gtk.css index b565550..2bd46d1 100644 --- a/gtk/src/Zukitwo/gtk-3.0/gtk.css +++ b/gtk/src/Zukitwo/gtk-3.0/gtk.css @@ -185,7 +185,7 @@ notebook > header > tabs > arrow:active:hover, notebook > header > tabs > arrow: notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, button:checked { color: #2c2c2c; outline-color: rgba(44, 44, 44, 0.3); background-image: linear-gradient(to bottom, #bfbfbf, #c9c9c9); box-shadow: inset 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px rgba(0, 0, 0, 0.08), inset -1px 0 rgba(0, 0, 0, 0.08), inset 0 -1px rgba(0, 0, 0, 0.08); border-color: #919191; border-top-color: #787878; } -notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } +notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow.flat:disabled, button.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } notebook > header > tabs > arrow:disabled, button:disabled { color: #818181; box-shadow: none; border-color: #b0b0b0; background-color: #e3e3e3; text-shadow: none; -gtk-icon-shadow: none; }