Merge pull request #235 from rosylilly/disable-expand-profile-emoji

Disable profile emoji expantion
dwango · Dec 25, 2018 · b4cc1a1 · b4cc1a1
2 parents f790258 + 327de39
commit b4cc1a1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/javascript/styles/nico/profile_emoji.scss b/app/javascript/styles/nico/profile_emoji.scss
@@ -1,3 +1,8 @@
+/**
+ * DO NOT EXPAND PROFILE EMOJI.
+ * this feature conflict with https://github.com/tootsuite/mastodon/pull/8205/files
+ * Uncomment this section, If you have any great solution.
+
 // Overrides 'overflow: hidden' due to display expanded emojis
 .status__content,
 .display-name__html,
@@ -23,3 +28,5 @@
     }
   }
 }
+
+ */