Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-20 08:17:15 +00:00
parent 6cb47f17fc 81d29e4126
commit 6f11aa8383
7 changed files with 197 additions and 104 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2104,7 +2104,7 @@
    padding: 0 10px 8px;
  }

-  code {
+  kbd {
    display: inline-block;
    padding: 3px 5px;
    background-color: lighten($ui-base-color, 8%);