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

Conflicts: config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
parent 625c4f36ef 6aa5ea1b5d
commit b481e4fac1
113 changed files with 595 additions and 753 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -3181,6 +3181,7 @@ a.status-card {
  &.active {
    background: $ui-highlight-color;
    color: $primary-text-color;
+    outline: 0;

    .privacy-dropdown__option__content {
      color: $primary-text-color;
--- a/app/javascript/styles/mastodon/footer.scss
+++ b/app/javascript/styles/mastodon/footer.scss
@ -26,5 +26,13 @@
        text-decoration: none;
      }
    }
+
+    img {
+      margin: 0 4px;
+      position: relative;
+      bottom: -1px;
+      height: 18px;
+      vertical-align: top;
+    }
  }
 }