about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/emoji
diff options
context:
space:
mode:
authorNolan Lawson <nolan@nolanlawson.com>2019-03-16 12:13:15 -0700
committerEugen Rochko <eugen@zeonfederated.com>2019-03-16 20:13:15 +0100
commitdb06b25376ac7e844e86fb9890fa9f1c2edd2d60 (patch)
treeb387deeb26bbbf05e7b8e470436cd00f91afe20f /app/javascript/mastodon/features/emoji
parent6a3f08661f8d23e5f93717f36df1463842bfd936 (diff)
fix: update to emoji-mart 2.10.0 (#10281)
* fix: update to emoji-mart 2.10.0

* remove useless change

* fix CSS style of emoji picker, improve a11y

* fix missing newline in scss

* fix the title and input fonts
Diffstat (limited to 'app/javascript/mastodon/features/emoji')
-rw-r--r--app/javascript/mastodon/features/emoji/emoji_picker.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/emoji/emoji_picker.js b/app/javascript/mastodon/features/emoji/emoji_picker.js
index 044d38cb2..73fcaa8c8 100644
--- a/app/javascript/mastodon/features/emoji/emoji_picker.js
+++ b/app/javascript/mastodon/features/emoji/emoji_picker.js
@@ -1,5 +1,5 @@
-import Picker from 'emoji-mart/dist-es/components/picker/picker';
-import Emoji from 'emoji-mart/dist-es/components/emoji/emoji';
+import Picker from 'emoji-mart/dist-modern/components/picker/picker';
+import Emoji from 'emoji-mart/dist-modern/components/emoji/emoji';
 
 export {
   Picker,