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

2019-04-19 10:44:10 +02:00
parent 546688aa1d 3d70ec470a
commit 268417daf3
10 changed files with 147 additions and 121 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3961,14 +3961,6 @@ a.status-card.compact:hover {
  font-size: 14px;
 }

-.confirmation-modal {
-  max-width: 85vw;
-
-  @media screen and (min-width: 480px) {
-    max-width: 380px;
-  }
-}
-
 .mute-modal {
  line-height: 24px;
 }
@@ -4147,6 +4139,10 @@ a.status-card.compact:hover {
      color: darken($lighter-text-color, 4%);
    }
  }
+
+  .confirmation-modal__secondary-button {
+    flex-shrink: 1;
+  }
 }

 .confirmation-modal__container,