diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-06 22:02:21 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-06 22:02:21 -0600 |
| commit | dc9951d400fc6f4e9080d29589bf186fb081f4f6 (patch) | |
| tree | 06491c209236128adaf47644babd2ade44c490e3 /src/components/emoji_picker | |
| parent | 18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff) | |
| parent | 610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/components/emoji_picker')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 2 | ||||
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.scss | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index bd5c2e39..f6920208 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -25,7 +25,7 @@ const filterByKeyword = (list, keyword = '') => { if (keyword === '') return list const keywordLowercase = keyword.toLowerCase() - let orderedEmojiList = [] + const orderedEmojiList = [] for (const emoji of list) { const indexOfKeyword = emoji.displayText.toLowerCase().indexOf(keywordLowercase) if (indexOfKeyword > -1) { diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss index 2055e02e..a2f17c51 100644 --- a/src/components/emoji_picker/emoji_picker.scss +++ b/src/components/emoji_picker/emoji_picker.scss @@ -7,7 +7,8 @@ right: 0; left: 0; margin: 0 !important; - z-index: 100; + // TODO: actually use popover in emoji picker + z-index: var(--ZI_popovers); background-color: $fallback--bg; background-color: var(--popover, $fallback--bg); color: $fallback--link; |