Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adwaita: Drop some unneeded overrides

Browse Source 
The pseudoclasses work fine on the subnodes without having to also apply
`parent:class subnode`.
This commit is contained in:
Daniel Boles
2018-07-02 21:45:06 +01:00
parent c892d2767a
commit 269a9d8528
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3344,8 +3344,6 @@ progressbar {
trough { @extend %scale_trough; }
&:backdrop trough { @extend %scale_trough:backdrop; } // looks like states are not passed to the trough component here
progress {
@extend %scale_highlight;
@@ -3372,8 +3370,6 @@ progressbar {
}
}
&:backdrop progress { @extend %scale_highlight:backdrop; } // states not passed here as well
&.osd { // progressbar.osd used for epiphany page loading progress
min-width: 3px;
min-height: 3px;

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

@@ -1185,9 +1185,9 @@ scale trough, scale fill, progressbar trough { border: 1px solid #1b1f20; border
scale trough:disabled, scale fill:disabled, progressbar trough:disabled { background-color: #2d3234; }
scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { background-color: #2c3233; border-color: #202425; transition: 200ms ease-out; }
scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop { background-color: #2c3233; border-color: #202425; transition: 200ms ease-out; }
scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { background-color: #2d3234; }
scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled { background-color: #2d3234; }
row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled, row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { border-color: #0f2b48; }
@@ -1199,9 +1199,9 @@ scale highlight, progressbar progress { border: 1px solid #0f2b48; border-radius
scale highlight:disabled, progressbar progress:disabled { background-color: transparent; border-color: transparent; }
scale highlight:backdrop, progressbar progress:backdrop, progressbar:backdrop progress { border-color: #0f2b48; }
scale highlight:backdrop, progressbar progress:backdrop { border-color: #0f2b48; }
scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled { background-color: transparent; border-color: transparent; }
scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled { background-color: transparent; border-color: transparent; }
row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled, row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress { border-color: #0f2b48; }

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

@@ -1205,9 +1205,9 @@ scale trough, scale fill, progressbar trough { border: 1px solid #b6b6b3; border
scale trough:disabled, scale fill:disabled, progressbar trough:disabled { background-color: #f1f1f1; }
scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { background-color: #dadad8; border-color: #c0c0bd; transition: 200ms ease-out; }
scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop { background-color: #dadad8; border-color: #c0c0bd; transition: 200ms ease-out; }
scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { background-color: #f1f1f1; }
scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled { background-color: #f1f1f1; }
row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled, row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { border-color: #184472; }
@@ -1219,9 +1219,9 @@ scale highlight, progressbar progress { border: 1px solid #184472; border-radius
scale highlight:disabled, progressbar progress:disabled { background-color: transparent; border-color: transparent; }
scale highlight:backdrop, progressbar progress:backdrop, progressbar:backdrop progress { border-color: #4a90d9; }
scale highlight:backdrop, progressbar progress:backdrop { border-color: #4a90d9; }
scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled { background-color: transparent; border-color: transparent; }
scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled { background-color: transparent; border-color: transparent; }
row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled, row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress { border-color: #184472; }