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

Merge branch 'adwaita-osd-spinbutton-entry-fix-3-24' into 'gtk-3-24'

Browse Source 
Horizontal OSD spinbutton entry fix

See merge request GNOME/gtk!331
This commit is contained in:
Jakub Steiner 2019-01-29 09:40:51 +00:00
commit 64c28f40a0
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1164,7 +1164,7 @@ spinbutton {
padding: 0;
entry {
%spinbutton_horz_entry {
min-width: 28px;
// reset all the other props since the spinbutton node is styled here
margin: 0;
@ -1177,6 +1177,10 @@ spinbutton {
&:backdrop:disabled { background-color: transparent; }
}
entry {
@extend %spinbutton_horz_entry;
}
button {
min-height: 16px;
margin: 0;
@ -1230,6 +1234,10 @@ spinbutton {
// OSD horizontal
.osd &:not(.vertical) {
entry {
@extend %spinbutton_horz_entry;
}
button {
@include button(undecorated);

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

@ -489,7 +489,7 @@ button:link > label, button:visited > label { text-decoration-line: underline; }
/***************** GtkSpinButton * */
spinbutton:not(.vertical) { padding: 0; }
spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; }
spinbutton:not(.vertical) entry, .osd spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; }
spinbutton:not(.vertical) entry:backdrop:disabled { background-color: transparent; }

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

@ -497,7 +497,7 @@ button:link > label, button:visited > label { text-decoration-line: underline; }
/***************** GtkSpinButton * */
spinbutton:not(.vertical) { padding: 0; }
spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; }
spinbutton:not(.vertical) entry, .osd spinbutton:not(.vertical) entry { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; }
spinbutton:not(.vertical) entry:backdrop:disabled { background-color: transparent; }