AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: proper colours for inactive emoji buttons

Browse Source 
Use opacity to differentiate unselected/hovered/selected buttons. It had
assumed bg < border < fg colours, which may be false, as in Adwaita:dark

This also means we do not need to special-case for the backdrop state.

https://bugzilla.gnome.org/show_bug.cgi?id=786956
This commit is contained in:
Daniel Boles 2017-09-02 16:54:47 +01:00 committed by Matthias Clasen
parent 8a8a643b03
commit 99b314084b
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/theme/Adwaita/_common.scss
View File

@ -4414,15 +4414,14 @@ button.emoji-section {
&:hover { border-color: $borders_color; }
&:checked { border-color: $selected_bg_color; }
color: $borders_color;
&:hover { color: mix($fg_color, $borders_color, 50%); }
&:checked { color: $fg_color; }
&:backdrop { color: $backdrop_borders_color; }
&:backdrop:checked { color: $backdrop_fg_color; }
label {
padding: 0;
opacity: 0.55;
}
&:hover label { opacity: 0.775; }
&:checked label { opacity: 1; }
}
.emoji {

12
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -1896,7 +1896,7 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w
/********* Emoji * */
popover.emoji-picker { padding-left: 0; padding-right: 0; }
button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid; border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset props inherited from the button style */ background: none; box-shadow: none; text-shadow: none; outline-offset: -5px; color: #1b1f20; }
button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid; border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset props inherited from the button style */ background: none; box-shadow: none; text-shadow: none; outline-offset: -5px; }
button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
@ -1904,15 +1904,11 @@ button.emoji-section:hover { border-color: #1b1f20; }
button.emoji-section:checked { border-color: #215d9c; }
button.emoji-section:hover { color: #858686; }
button.emoji-section label { padding: 0; opacity: 0.55; }
button.emoji-section:checked { color: #eeeeec; }
button.emoji-section:hover label { opacity: 0.775; }
button.emoji-section:backdrop { color: #202425; }
button.emoji-section:backdrop:checked { color: #919494; }
button.emoji-section label { padding: 0; }
button.emoji-section:checked label { opacity: 1; }
.emoji { font-size: x-large; padding: 6px; border-radius: 6px; }

12
gtk/theme/Adwaita/gtk-contained.css
View File

@ -1916,7 +1916,7 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w
/********* Emoji * */
popover.emoji-picker { padding-left: 0; padding-right: 0; }
button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid; border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset props inherited from the button style */ background: none; box-shadow: none; text-shadow: none; outline-offset: -5px; color: #b6b6b3; }
button.emoji-section { border-color: transparent; border-width: 3px; border-style: none none solid; border-radius: 0; margin: 2px 4px 2px 4px; padding: 3px 0 0; min-width: 32px; min-height: 28px; /* reset props inherited from the button style */ background: none; box-shadow: none; text-shadow: none; outline-offset: -5px; }
button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
@ -1924,15 +1924,11 @@ button.emoji-section:hover { border-color: #b6b6b3; }
button.emoji-section:checked { border-color: #4a90d9; }
button.emoji-section:hover { color: #727574; }
button.emoji-section label { padding: 0; opacity: 0.55; }
button.emoji-section:checked { color: #2e3436; }
button.emoji-section:hover label { opacity: 0.775; }
button.emoji-section:backdrop { color: #c0c0bd; }
button.emoji-section:backdrop:checked { color: #8b8e8f; }
button.emoji-section label { padding: 0; }
button.emoji-section:checked label { opacity: 1; }
.emoji { font-size: x-large; padding: 6px; border-radius: 6px; }