Merge fixes

3 months ago · f84965bfd6
parent efb1635022
commit f84965bfd6
2 changed files with 2 additions and 1 deletions
--- 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 }}>
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@ -9048,6 +9048,8 @@ noscript {
  }

  &--empty {
+    margin-top: 0;
+
    .emoji-button {
      padding: 0;
    }