diff options
author | ThibG <thib@sitedethib.com> | 2019-05-23 20:49:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-23 20:49:18 +0200 |
commit | c394d3cb25ad39f169fbf45d18153a51d34c43ad (patch) | |
tree | 11d01b48950d43991005ae1ba7190165edfd2c2b /app/javascript/flavours/glitch/styles/components/emoji.scss | |
parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
parent | a1143a19c076c55bf97b3429796db93dd96e0812 (diff) |
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components/emoji.scss')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/emoji.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/emoji.scss b/app/javascript/flavours/glitch/styles/components/emoji.scss index dd386d698..160e9d811 100644 --- a/app/javascript/flavours/glitch/styles/components/emoji.scss +++ b/app/javascript/flavours/glitch/styles/components/emoji.scss @@ -17,6 +17,7 @@ box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4); border-radius: 4px; margin-top: 5px; + z-index: 2; .emoji-mart-scroll { transition: opacity 200ms ease; |