From a8559458c3dece078db3e087973bfee10379318a Mon Sep 17 00:00:00 2001 From: "Brian C. Lindner" Date: Sun, 31 May 2020 14:34:34 -0400 Subject: [Glitch] Allow Ctrl-click to keep EmojiPicker window open Port 64154c5161d4d5c82877fba549d72068cc7f9e16 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/features/emoji_picker/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/javascript/flavours') 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); } -- cgit From c225ac8b9eebf4cc3f32bf3f204f7a5256d93d38 Mon Sep 17 00:00:00 2001 From: Christopher Choi Date: Sun, 31 May 2020 11:35:18 -0700 Subject: [Glitch] Adjust flash alert contrast for better readability Port b4a8400afd88a2ae8822757e5d30975494be2512 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours') 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; } -- cgit