diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-01 19:41:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 19:41:33 +0200 |
| commit | f328f2faa3fbdb182921366c6a20e745c069b840 (patch) | |
| tree | 39b6adb53dfda648ff7e6c802f9ec758049f6eb2 /app/javascript/flavours | |
| parent | 1f94f4009e5b072f8b508b1bf1a046ea034de7c1 (diff) | |
| parent | c225ac8b9eebf4cc3f32bf3f204f7a5256d93d38 (diff) | |
Merge pull request #1347 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours')
| -rw-r--r-- | app/javascript/flavours/glitch/features/emoji_picker/index.js | 7 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/forms.scss | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js index 3717fcd82..14e5cb94a 100644 --- a/app/javascript/flavours/glitch/features/emoji_picker/index.js +++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js @@ -279,12 +279,13 @@ class EmojiPickerMenu extends React.PureComponent { }; } - handleClick = emoji => { + handleClick = (emoji, event) => { if (!emoji.native) { emoji.native = emoji.colons; } - - this.props.onClose(); + if (!event.ctrlKey) { + this.props.onClose(); + } this.props.onPick(emoji); } diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index 5de650f0a..6767c15f1 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -578,7 +578,7 @@ code { &.alert { border: 1px solid rgba($error-value-color, 0.5); - background: rgba($error-value-color, 0.25); + background: rgba($error-value-color, 0.1); color: $error-value-color; } |