From 8f924eb9617f87bf6ce53085b2ff82bc0d1a1610 Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Thu, 6 Jun 2019 19:30:14 +0900 Subject: [PATCH] [Glitch] Fix emoji picker being always displayed Port c402c291f4991e2b021d8c13b557e6a8f650dcf3 to glitch-soc Signed-off-by: Thibaut Girka --- .../glitch/features/compose/components/compose_form.js | 2 +- .../flavours/glitch/styles/components/composer.scss | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js index 87ab2aa04f..52aa79b350 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js @@ -335,7 +335,7 @@ class ComposeForm extends ImmutablePureComponent { /> -
+
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss index b2603a0085..746698c5bc 100644 --- a/app/javascript/flavours/glitch/styles/components/composer.scss +++ b/app/javascript/flavours/glitch/styles/components/composer.scss @@ -289,12 +289,20 @@ } } -.emoji-picker-wrapper, .autosuggest-textarea__suggestions-wrapper { position: relative; height: 0; } +.emoji-picker-wrapper { + position: relative; + height: 0; + + &.emoji-picker-wrapper--hidden { + display: none; + } +} + .autosuggest-textarea__suggestions { display: block; position: absolute;