Merge fixes
This commit is contained in:
parent
13c9fa62fa
commit
40ae5aed66
2 changed files with 2 additions and 1 deletions
|
@ -402,7 +402,6 @@ class EmojiPickerDropdown extends PureComponent {
|
||||||
active={active}
|
active={active}
|
||||||
iconComponent={MoodIcon}
|
iconComponent={MoodIcon}
|
||||||
onClick={this.onToggle}
|
onClick={this.onToggle}
|
||||||
inverted
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
|
<Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
|
||||||
|
|
|
@ -9086,6 +9086,8 @@ noscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
&--empty {
|
&--empty {
|
||||||
|
margin-top: 0;
|
||||||
|
|
||||||
.emoji-button {
|
.emoji-button {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue