ZK-5784: a fontawesome bug causes zk to lose all styles in Chrome and…

… Edge
zkoss · Sep 6, 2024 · 8e739ee · 8e739ee
1 parent 150214b
commit 8e739ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/zkdoc/release-note b/zkdoc/release-note
@@ -8,6 +8,7 @@ ZK 10.1.0
   ZK-5775: Improve ZK-5393 by caching FileUpload classes
   ZK-5780: dompurify Template Injection vulnerability
   ZK-5657: Missing zk-bom version since 10.0.0
+  ZK-5784: a fontawesome bug causes zk to lose all styles in Chrome and Edge
 
 * Upgrade Notes
   + Remove Htmls.encodeJavaScript(), Strings.encodeJavaScript(), Strings.escape() with Strings.ESCAPE_JAVASCRIPT, and replace them with OWASP Java Encoder APIs instead.

diff --git a/zul/src/main/resources/web/zul/less/font/_animated.less b/zul/src/main/resources/web/zul/less/font/_animated.less
@@ -105,10 +105,10 @@
 
 @keyframes  ~'@{fa-css-prefix}-bounce' {
   0%   { transform: scale(1,1) translateY(0); }
-  10%  { transform: ~'scale(var(--#{$fa-css-prefix}-bounce-start-scale-x, 1.1),var(--#{$fa-css-prefix}-bounce-start-scale-y, 0.9))' translateY(0); }
-  30%  { transform: ~'scale(var(--#{$fa-css-prefix}-bounce-jump-scale-x, 0.9),var(--#{$fa-css-prefix}-bounce-jump-scale-y, 1.1))' ~'translateY(var(--#{$fa-css-prefix}-bounce-height, -0.5em))'; }
-  50%  { transform: ~'scale(var(--#{$fa-css-prefix}-bounce-land-scale-x, 1.05),var(--#{$fa-css-prefix}-bounce-land-scale-y, 0.95))' translateY(0); }
-  57%  { transform: ~'scale(1,1) translateY(var(--#{$fa-css-prefix}-bounce-rebound, -0.125em))'; }
+  10%  { transform: ~'scale(var(--@{fa-css-prefix}-bounce-start-scale-x, 1.1),var(--@{fa-css-prefix}-bounce-start-scale-y, 0.9))' translateY(0); }
+  30%  { transform: ~'scale(var(--@{fa-css-prefix}-bounce-jump-scale-x, 0.9),var(--@{fa-css-prefix}-bounce-jump-scale-y, 1.1))' ~'translateY(var(--@{fa-css-prefix}-bounce-height, -0.5em))'; }
+  50%  { transform: ~'scale(var(--@{fa-css-prefix}-bounce-land-scale-x, 1.05),var(--@{fa-css-prefix}-bounce-land-scale-y, 0.95))' translateY(0); }
+  57%  { transform: ~'scale(1,1) translateY(var(--@{fa-css-prefix}-bounce-rebound, -0.125em))'; }
   64%  { transform: scale(1,1) translateY(0); }
   100% { transform: scale(1,1) translateY(0); }
 }