From d736739e8ff79044be6f605cd28c89ead710aec6 Mon Sep 17 00:00:00 2001 From: cwm Date: Thu, 21 Dec 2017 13:04:40 -0600 Subject: [PATCH] instead of in KeyboardShortcuts component (tootsuite pr #6049) --- .../features/keyboard_shortcuts/index.js | 30 +++++++++---------- .../glitch/styles/components/index.scss | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.js b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.js index 0a12737643..8aed471f27 100644 --- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.js +++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.js @@ -33,63 +33,63 @@ export default class KeyboardShortcuts extends ImmutablePureComponent { - r + r - m + m - f + f - b + b - enter + enter - up + up - down + down - 1-9 + 1-9 - n + n - alt+n + alt+n - backspace + backspace - s + s - esc + esc - x + x - ? + ? diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 06521d7087..35f308b2d4 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -2310,7 +2310,7 @@ padding: 0 10px 8px; } - code { + kbd { display: inline-block; padding: 3px 5px; background-color: lighten($ui-base-color, 8%);