callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adwaita-emoji-picker-adjustments' into 'gtk-3-24'

Browse Source 
Adwaita: Emoji picker adjustments

See merge request GNOME/gtk!1159
This commit is contained in:
Jakub Steiner
2019-11-04 19:33:39 +00:00
parent f261b41d47 1051c1fcad
commit 4e346076f2
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4710,7 +4710,12 @@ stackswitcher button.text-button.circular { // FIXME aggregate with buttons
* Emoji * * Emoji *
********/ ********/
popover.emoji-picker { padding-left: 0; padding-right: 0; } popover.emoji-picker {
padding-left: 0;
padding-right: 0;
entry.search { margin: 3px 5px 5px 5px; }
}
button.emoji-section { button.emoji-section {
border-color: transparent; border-color: transparent;
@ -4730,8 +4735,11 @@ button.emoji-section {
outline-offset: -5px; outline-offset: -5px;
&:first-child { margin-left: 7px; }
&:last-child { margin-right: 7px; }
&:backdrop:not(:checked) { border-color: transparent; } &:backdrop:not(:checked) { border-color: transparent; }
&:hover { border-color: $borders_color; } &:hover { border-color: if($variant == 'light', $borders_color, transparentize($fg_color, .9)); }
&:checked { border-color: $selected_bg_color; } &:checked { border-color: $selected_bg_color; }
label { label {
@ -4747,10 +4755,10 @@ button.emoji-section {
popover.emoji-picker .emoji { popover.emoji-picker .emoji {
font-size: x-large; font-size: x-large;
padding: 6px; padding: 6px;
border-radius: 6px;
:hover { :hover {
background: $selected_bg_color; background: $selected_bg_color;
border-radius: 6px;
} }
} }

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

@ -1984,11 +1984,17 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w
/********* Emoji * */ /********* Emoji * */
popover.emoji-picker { padding-left: 0; padding-right: 0; } popover.emoji-picker { padding-left: 0; padding-right: 0; }
popover.emoji-picker entry.search { margin: 3px 5px 5px 5px; }
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 { 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:first-child { margin-left: 7px; }
button.emoji-section:last-child { margin-right: 7px; }
button.emoji-section:backdrop:not(:checked) { border-color: transparent; } button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
button.emoji-section:hover { border-color: #1b1b1b; } button.emoji-section:hover { border-color: rgba(238, 238, 236, 0.1); }
button.emoji-section:checked { border-color: #15539e; } button.emoji-section:checked { border-color: #15539e; }
@ -1998,9 +2004,9 @@ button.emoji-section:hover label { opacity: 0.775; }
button.emoji-section:checked label { opacity: 1; } button.emoji-section:checked label { opacity: 1; }
popover.emoji-picker .emoji { font-size: x-large; padding: 6px; border-radius: 6px; } popover.emoji-picker .emoji { font-size: x-large; padding: 6px; }
popover.emoji-picker .emoji :hover { background: #15539e; } popover.emoji-picker .emoji :hover { background: #15539e; border-radius: 6px; }
popover.emoji-completion arrow { border: none; background: none; } popover.emoji-completion arrow { border: none; background: none; }

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

@ -2000,8 +2000,14 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w
/********* Emoji * */ /********* Emoji * */
popover.emoji-picker { padding-left: 0; padding-right: 0; } popover.emoji-picker { padding-left: 0; padding-right: 0; }
popover.emoji-picker entry.search { margin: 3px 5px 5px 5px; }
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 { 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:first-child { margin-left: 7px; }
button.emoji-section:last-child { margin-right: 7px; }
button.emoji-section:backdrop:not(:checked) { border-color: transparent; } button.emoji-section:backdrop:not(:checked) { border-color: transparent; }
button.emoji-section:hover { border-color: #cdc7c2; } button.emoji-section:hover { border-color: #cdc7c2; }
@ -2014,9 +2020,9 @@ button.emoji-section:hover label { opacity: 0.775; }
button.emoji-section:checked label { opacity: 1; } button.emoji-section:checked label { opacity: 1; }
popover.emoji-picker .emoji { font-size: x-large; padding: 6px; border-radius: 6px; } popover.emoji-picker .emoji { font-size: x-large; padding: 6px; }
popover.emoji-picker .emoji :hover { background: #3584e4; } popover.emoji-picker .emoji :hover { background: #3584e4; border-radius: 6px; }
popover.emoji-completion arrow { border: none; background: none; } popover.emoji-completion arrow { border: none; background: none; }