From 172e73535ecf0c60f7667b2922790adcd6c3908b Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Tue, 12 Jul 2022 00:55:35 +0200 Subject: [PATCH] Make the emoji picker blob cat a static asset --- .../glitch/features/emoji_picker/index.js | 3 +-- .../compose/components/emoji_picker_dropdown.js | 3 +-- public/blobCat.png | Bin 0 -> 9348 bytes 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 public/blobCat.png diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js index 036a515f6c..8d06ea2194 100644 --- a/app/javascript/flavours/glitch/features/emoji_picker/index.js +++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js @@ -472,9 +472,8 @@ class EmojiPickerDropdown extends React.PureComponent { {button || blobCat emoji} - {/* TODO: Fetch :blobCat: From custom_emojis directly */} diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index c1419e1785..3d00d139dc 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -390,9 +390,8 @@ class EmojiPickerDropdown extends React.PureComponent { {button || blobCat emoji} - {/* TODO: Fetch :blobCat: From custom_emojis directly */} diff --git a/public/blobCat.png b/public/blobCat.png new file mode 100644 index 0000000000000000000000000000000000000000..08e1b408072ba3fd009ce097a52762a8012fabc3 GIT binary patch literal 9348 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