[gtk/gtk-3-24: 1/2] Adwaita: Fix syntax error in cross-fade()
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 1/2] Adwaita: Fix syntax error in cross-fade()
- Date: Tue, 14 Jan 2020 05:33:40 +0000 (UTC)
commit 404f4c6627c94964b87a64cb25603abf64c03f73
Author: nana-4 <hnmaigo gmail com>
Date: Tue Jan 14 06:21:17 2020 +0900
Adwaita: Fix syntax error in cross-fade()
cross-fade() requires two images.
Fixes https://gitlab.gnome.org/GNOME/gtk/issues/2371
gtk/theme/Adwaita/_common.scss | 6 +++---
gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
gtk/theme/Adwaita/gtk-contained.css | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index dbeb5c31ed..6fbb0f04b1 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -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 */
}
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 1a18c84305..54170f090e 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -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; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 91ddb93660..6ce84fa5c2 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -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; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]