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

2018-08-29 13:57:56 +02:00
parent c4b3479173 702a926299
commit c24491a8df
9 changed files with 121 additions and 110 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -5367,7 +5367,7 @@ noscript {
  dt,
  dd {
    box-sizing: border-box;
-    padding: 14px 20px;
+    padding: 14px 5px;
    text-align: center;
    max-height: 48px;
    overflow: hidden;