about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-07 07:50:47 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-11-07 07:50:47 +0100
commit6c0a6097ff7ddc23e9f024d3826a4f7cc1520f69 (patch)
tree31a15cf4bc3b319d675ebfe7b0351f9c2837cea3 /app/javascript/styles
parent54101563bbadbfafd9291a867d7fbea6df3a8b7b (diff)
parenta70e2cd649cbd82d534f03202fb3078a4ae1af1d (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/emoji_picker.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index e4ec96d89..1042ddda8 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -132,6 +132,10 @@
     &:active {
       outline: 0 !important;
     }
+
+    &::-webkit-search-cancel-button {
+      display: none;
+    }
   }
 }