From 40ae5aed66ac0dd2dfc70c5111d439db6b8e988e Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sat, 24 Feb 2024 16:22:40 -0600
Subject: [PATCH] Merge fixes

---
 .../features/compose/components/emoji_picker_dropdown.jsx       | 1 -
 app/javascript/flavours/glitch/styles/components.scss           | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index a26d3e3888..4c7e74675a 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -402,7 +402,6 @@ class EmojiPickerDropdown extends PureComponent {
           active={active}
           iconComponent={MoodIcon}
           onClick={this.onToggle}
-          inverted
         />
 
         <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 130e4a0991..85bfc49d63 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -9086,6 +9086,8 @@ noscript {
   }
 
   &--empty {
+    margin-top: 0;
+
     .emoji-button {
       padding: 0;
     }