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

2019-11-23 19:03:01 +01:00
parent 55f5e81a9d 054ef83fc5
commit c0f7e21685
10 changed files with 36 additions and 18 deletions
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -513,6 +513,10 @@ code {
  &__overlay-area {
    position: relative;

+    &__blurred form {
+      filter: blur(2px);
+    }
+
    &__overlay {
      position: absolute;
      top: 0;
@@ -523,8 +527,10 @@ code {
      justify-content: center;
      align-items: center;
      background: rgba($ui-base-color, 0.65);
-      backdrop-filter: blur(2px);
      border-radius: 4px;
+      margin-left: -4px;
+      margin-top: -4px;
+      padding: 4px;

      &__content {
        text-align: center;