Merge branch 'rm/371272' into 'master'

fix: use transform: scale property instead of zoom for browser compatibility See merge request kchat/webapp!961
Infomaniak · Nov 1, 2024 · 065bcb8 · 065bcb8
2 parents 69030f9 + d22fdce
commit 065bcb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/webapp/channels/src/sass/components/_emojisprite.scss b/webapp/channels/src/sass/components/_emojisprite.scss
@@ -9,8 +9,7 @@
     cursor: pointer;
     -moz-transform: scale(0.5);
     transform-origin: 0 0;
-    // Using zoom for now as it results in less blurry emojis on Chrome - MM-34178
-    zoom: 0.5;
+    transform: scale(0.5); // IK modifications : use transform: scale() instead of zoom for browser compatibility
 }
 
 .emojisprite {
@@ -21,7 +20,7 @@
     border-radius: 18px;
     cursor: pointer;
     -moz-transform: scale(0.35);
-    zoom: 0.35;
+    transform: scale(0.35);
 }
 
 .emojisprite-loading {
@@ -33,7 +32,7 @@
     border-radius: 18px;
     cursor: pointer;
     -moz-transform: scale(0.35);
-    zoom: 0.35;
+    transform: scale(0.35);
 }
 
 .emoji-category-recent { background-image: url('images/emoji-sheets/apple-sheet.png'); }

diff --git a/webapp/channels/src/sass/components/_emoticons.scss b/webapp/channels/src/sass/components/_emoticons.scss
@@ -546,12 +546,11 @@ $emoji-footer-height: $emoji-footer-border-width + $emoji-half-height + $emoji-p
 
         img {
             -moz-transform: scale(0.45);
-            zoom: 0.45;
+            transform: scale(0.45); // IK modifications : use transform: scale() instead of zoom for browser compatibility
 
             &.emoji-category--custom {
                 -moz-transform: scale(1);
-                transform: scale(1.25);
-                zoom: 1;
+                transform: scale(1);
             }
         }
     }