diff --git a/webapp/components/shortcuts_modal.jsx b/webapp/components/shortcuts_modal.jsx
index 3bbfcb660e..32a3f9c4bc 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 {
- {renderShortcut(formatMessage(shortcuts.mainHeader))}
+ {formatMessage(shortcuts.mainHeader)}
@@ -322,6 +320,7 @@ class ShortcutsModal extends React.PureComponent {
{formatMessage(shortcuts.msgHeader)}
+ {renderShortcut(formatMessage(shortcuts.msgMarkAsRead))}
{formatMessage(shortcuts.msgInputHeader)}
{renderShortcut(formatMessage(shortcuts.msgEdit))}
diff --git a/webapp/sass/routes/_shortcuts-modal.scss b/webapp/sass/routes/_shortcuts-modal.scss
index 854340b2cc..817239f2f0 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;
- }
- }
}
}
}