diff options
author | George Goldberg <george@gberg.me> | 2017-09-04 11:01:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-04 11:01:25 +0100 |
commit | ce5d81582aade689c9e21c501bfb8d1a4d70f7c5 (patch) | |
tree | cc4ffc398dfc22cafd726fc4c1d93a1ba40508ee /webapp | |
parent | 9c1f6c9fd5716fece1afaf8a3d6a7dd235744a38 (diff) | |
download | chat-ce5d81582aade689c9e21c501bfb8d1a4d70f7c5.tar.gz chat-ce5d81582aade689c9e21c501bfb8d1a4d70f7c5.tar.bz2 chat-ce5d81582aade689c9e21c501bfb8d1a4d70f7c5.zip |
Revert "[PLT-7471] Slight modifications to keyboards dialog (#7325)" (#7363)
This reverts commit 967a0df0f87e6fe942e9a7a1183014d299526e94.
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/shortcuts_modal.jsx | 17 | ||||
-rw-r--r-- | webapp/sass/routes/_shortcuts-modal.scss | 27 |
2 files changed, 9 insertions, 35 deletions
diff --git a/webapp/components/shortcuts_modal.jsx b/webapp/components/shortcuts_modal.jsx index 3bbfcb660..32a3f9c4b 100644 --- a/webapp/components/shortcuts_modal.jsx +++ b/webapp/components/shortcuts_modal.jsx @@ -12,14 +12,8 @@ import React from 'react'; const allShortcuts = defineMessages({ mainHeader: { - default: { - id: 'shortcuts.header', - defaultMessage: 'Keyboard Shortcuts\tCtrl|/' - }, - mac: { - id: 'shortcuts.header.mac', - defaultMessage: 'Keyboard Shortcuts\t⌘|/' - } + id: 'shortcuts.header', + defaultMessage: 'Keyboard Shortcuts' }, navHeader: { id: 'shortcuts.nav.header', @@ -109,6 +103,10 @@ const allShortcuts = defineMessages({ id: 'shortcuts.msgs.header', defaultMessage: 'Messages' }, + msgMarkAsRead: { + id: 'shortcuts.msgs.mark_as_read', + defaultMessage: 'Mark current channel as read:\tEsc' + }, msgInputHeader: { id: 'shortcuts.msgs.input.header', defaultMessage: 'Works inside an empty input field' @@ -298,7 +296,7 @@ class ShortcutsModal extends React.PureComponent { <div className='shortcuts-content'> <Modal.Header closeButton={true}> <Modal.Title> - <strong>{renderShortcut(formatMessage(shortcuts.mainHeader))}</strong> + <strong>{formatMessage(shortcuts.mainHeader)}</strong> </Modal.Title> </Modal.Header> <Modal.Body ref='modalBody'> @@ -322,6 +320,7 @@ class ShortcutsModal extends React.PureComponent { <div className='section'> <div> <h4 className='section-title'><strong>{formatMessage(shortcuts.msgHeader)}</strong></h4> + {renderShortcut(formatMessage(shortcuts.msgMarkAsRead))} <span><strong>{formatMessage(shortcuts.msgInputHeader)}</strong></span> <div className='subsection'> {renderShortcut(formatMessage(shortcuts.msgEdit))} diff --git a/webapp/sass/routes/_shortcuts-modal.scss b/webapp/sass/routes/_shortcuts-modal.scss index 854340b2c..817239f2f 100644 --- a/webapp/sass/routes/_shortcuts-modal.scss +++ b/webapp/sass/routes/_shortcuts-modal.scss @@ -11,43 +11,18 @@ background: transparent; border: none; color: inherit; - padding: 20px 40px 20px; + padding: 40px 40px 20px; .close { color: inherit; font-size: 28px; font-weight: normal; right: 35px; - top: 35px; } .modal-title { color: inherit; font-size: 20px; - - > div { - &:first-child { - margin-bottom: 2.5em; - } - } - - .shortcut-line { - margin: 17px 0; - - span { - &:first-child { - margin-right: 5px; - } - } - - .shortcut-key { - border-radius: 3px; - font-size: .9em; - font-weight: 500; - margin: 5px 0 5px 5px; - padding: 1px 5px; - } - } } } } |