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

Merge branch 'wip/dboles/spinbutton-button-backdrop-disabled-3' into 'gtk-3-24'

Browse Source 
SpinButton: Fix wrong background/icon colours in button:backdrop:disabled

See merge request GNOME/gtk!489
This commit is contained in:
Jakub Steiner
2019-01-21 13:57:43 +00:00
parent d3e5cc3b9d d1b14a7deb
commit f7df4853e8
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1216,6 +1216,7 @@ spinbutton {
&:backdrop:disabled {
color: transparentize($backdrop_insensitive_color,0.7);
background-color: transparent;
background-image: none;
border-style: none none none solid; // It is needed or it gets overridden
&:dir(rtl) { border-style: none solid none none; }

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

@ -505,7 +505,7 @@ spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1);
spinbutton:not(.vertical) button:backdrop { color: #86898a; background-color: transparent; border-color: rgba(32, 36, 37, 0.3); transition: 200ms ease-out; }
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(86, 97, 100, 0.3); background-color: transparent; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(86, 97, 100, 0.3); background-color: transparent; background-image: none; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }

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

@ -513,7 +513,7 @@ spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1);
spinbutton:not(.vertical) button:backdrop { color: #96999a; background-color: transparent; border-color: rgba(192, 192, 189, 0.3); transition: 200ms ease-out; }
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(195, 195, 192, 0.3); background-color: transparent; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(195, 195, 192, 0.3); background-color: transparent; background-image: none; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }

6
gtk/theme/HighContrast/_common.scss
View File

@ -980,7 +980,10 @@ spinbutton {
background-color: $bg_color;
}
&:disabled { color: transparentize($insensitive_fg_color, 0.7); }
&:disabled,
&:backdrop:disabled {
color: transparentize($insensitive_fg_color, 0.7);
}
&:active {
background-color: $osd_bg_color;
@ -994,7 +997,6 @@ spinbutton {
}
&:backdrop:disabled {
color: $insensitive_bg_color;
background-image: none;
border-style: none none none solid; // It is needed or it gets overridden

4
gtk/theme/HighContrast/gtk-contained-inverse.css
View File

@ -405,13 +405,13 @@ spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none;
spinbutton:not(.vertical) button:hover { color: #fff; background-color: #000; }
spinbutton:not(.vertical) button:disabled { color: rgba(128, 128, 128, 0.3); }
spinbutton:not(.vertical) button:disabled, spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(128, 128, 128, 0.3); }
spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.8); color: #fff; }
spinbutton:not(.vertical) button:backdrop { color: #fff; background-color: transparent; border-color: rgba(115, 115, 115, 0.3); }
spinbutton:not(.vertical) button:backdrop:disabled { color: #070707; background-image: none; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled { background-image: none; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }

4
gtk/theme/HighContrast/gtk-contained.css
View File

@ -409,13 +409,13 @@ spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none;
spinbutton:not(.vertical) button:hover { color: #000; background-color: #fff; }
spinbutton:not(.vertical) button:disabled { color: rgba(128, 128, 128, 0.3); }
spinbutton:not(.vertical) button:disabled, spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(128, 128, 128, 0.3); }
spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.8); color: #fff; }
spinbutton:not(.vertical) button:backdrop { color: #000; background-color: transparent; border-color: rgba(141, 141, 141, 0.3); }
spinbutton:not(.vertical) button:backdrop:disabled { color: white; background-image: none; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled { background-image: none; border-style: none none none solid; }
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }