Skip to content

Commit

Permalink
Fix disabled flat buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
lassekongo83 committed Dec 2, 2019
1 parent c62152b commit bc6555a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions gtk/src/Zukitre/gtk-3.0/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ button {
@include button(active);
}

@at-root %button_basic_flat,
&.flat { &:disabled { @include button(undecorated); }}

&:disabled {
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/Zukitre/gtk-3.0/gtk-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion gtk/src/Zukitre/gtk-3.0/gtk.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
1 change: 1 addition & 0 deletions gtk/src/Zukitwo/gtk-3.0/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ button {
@include button(active);
}

@at-root %button_basic_flat,
&.flat { &:disabled { @include button(undecorated); }}

&:disabled {
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/Zukitwo/gtk-3.0/gtk-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion gtk/src/Zukitwo/gtk-3.0/gtk.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down

0 comments on commit bc6555a

Please sign in to comment.