Merge branch 'master' into glitch-soc/merge-upstream

2018-08-22 20:56:32 +02:00
parent 628fca50e2 56f882aed6
commit e70fc059a9
103 changed files with 757 additions and 167 deletions
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@ -50,6 +50,12 @@ code {
        color: $highlight-text-color;
      }
    }
+
+    code {
+      border-radius: 3px;
+      padding: 0.2em 0.4em;
+      background: darken($ui-base-color, 12%);
+    }
  }

  .card {