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

Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
parent 648cf8bfd5 0c1a05b281
commit b9f314bba7
161 changed files with 5988 additions and 2055 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -220,6 +220,11 @@ $content-width: 840px;
      color: $error-value-color;
      font-weight: 500;
    }
+
+    .neutral-hint {
+      color: $dark-text-color;
+      font-weight: 500;
+    }
  }

  @media screen and (max-width: $no-columns-breakpoint) {