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

Merge branch 'adwaita-cross-fade-fix-gtk3' into 'gtk-3-24'

Browse Source 
Adwaita: Fix syntax error in cross-fade() (GTK3)

See merge request GNOME/gtk!1307
This commit is contained in:
Matthias Clasen
2020-01-14 05:32:45 +00:00
parent 8ed65a96b9 404f4c6627
commit 0bffcd8882
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1847,11 +1847,11 @@ headerbar { // headerbar border rounding
window.devel {
headerbar.titlebar:not(.selection-mode) {
$c: darken($bg_color, 10%);
$gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat,
$gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)),
linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
@if $variant == 'dark' {
$gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat,
$gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)),
linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%));
}
@ -1859,7 +1859,7 @@ window.devel {
background: $bg_color $gradient;
&:backdrop {
background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat,
background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
image($bg_color); /* background-color would flash */
}
}

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

@ -635,9 +635,9 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen
.titlebar:not(headerbar) separator { background-color: #1b1b1b; }
window.devel headerbar.titlebar:not(.selection-mode) { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(21, 83, 158, 0.1)), linear-gradient(to top, #232323 3px, #282828); }
window.devel headerbar.titlebar:not(.selection-mode) { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(21, 83, 158, 0.1)), linear-gradient(to top, #232323 3px, #282828); }
window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, image(#353535); /* background-color would flash */ }
window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#353535); /* background-color would flash */ }
/************ Pathbars * */
.path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }

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

@ -643,9 +643,9 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen
.titlebar:not(headerbar) separator { background-color: #cdc7c2; }
window.devel headerbar.titlebar:not(.selection-mode) { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(53, 132, 228, 0.2)), linear-gradient(to top, #d8d4d0, #dfdcd8 3px, #edebe9); }
window.devel headerbar.titlebar:not(.selection-mode) { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(53, 132, 228, 0.2)), linear-gradient(to top, #d8d4d0, #dfdcd8 3px, #edebe9); }
window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, image(#f6f5f4); /* background-color would flash */ }
window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#f6f5f4); /* background-color would flash */ }
/************ Pathbars * */
.path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }