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

2020-01-25 16:50:24 +01:00
parent 340cb4a04c 48c55b6392
commit 27ddcddcd3
67 changed files with 1136 additions and 376 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -6631,7 +6631,7 @@ noscript {
 }

 .announcements {
-  background: lighten($ui-base-color, 4%);
+  background: lighten($ui-base-color, 8%);
  border-top: 1px solid $ui-base-color;
  font-size: 13px;
  display: flex;
@ -6672,12 +6672,6 @@ noscript {
      font-weight: 500;
      margin-bottom: 10px;
    }
-
-    &__dismiss-icon {
-      position: absolute;
-      top: 12px;
-      right: 12px;
-    }
  }

  &__pagination {