Merge branch 'feat/flair-animations' into feat/emote-animations

destinygg · Feb 20, 2024 · 814566f · 814566f
2 parents 4c83f93 + 49d2d77
commit 814566f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/assets/chat/css/style.scss b/assets/chat/css/style.scss
@@ -1726,6 +1726,11 @@ hr {
   }
 }
 
+.pref-disableflairanimations a.user,
+.pref-disableflairanimations span.user {
+  animation: none !important;
+}
+
 /* OverlayScrollbars theme */
 .dgg-scroller-theme.os-scrollbar-horizontal {
   right: 10px;

diff --git a/assets/chat/js/const.js b/assets/chat/js/const.js
@@ -134,6 +134,7 @@ const settingsdefault = new Map(
     fontscale: 'auto',
     censorbadwords: false,
     disableemoteanimations: false,
+    disableflairanimations: false,
   }),
 );
 

diff --git a/assets/views/embed.html b/assets/views/embed.html
@@ -153,6 +153,12 @@ <h4>Messages</h4>
                 non-GIF emote animations
               </label>
             </div>
+            <div class="form-group checkbox">
+              <label title="Disable non-GIF flair animations">
+                <input name="disableflairanimations" type="checkbox" /> Disable
+                non-GIF flair animations
+              </label>
+            </div>
 
             <h4>Notifications</h4>
             <div class="form-group checkbox">