Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-25 15:17:21 +00:00
parent 995b59526b 85a395fab6
commit 837b3804bf
128 changed files with 1274 additions and 1030 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -3375,13 +3375,14 @@ a.status-card {
 }

 .modal-root {
+  position: relative;
  transition: opacity 0.3s linear;
  will-change: opacity;
  z-index: 9999;
 }

 .modal-root__overlay {
-  position: absolute;
+  position: fixed;
  top: 0;
  left: 0;
  right: 0;
@ -3390,7 +3391,7 @@ a.status-card {
 }

 .modal-root__container {
-  position: absolute;
+  position: fixed;
  top: 0;
  left: 0;
  width: 100%;
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@ -60,6 +60,10 @@
  }
 }

+.media-gallery-standalone__body {
+  overflow: hidden;
+}
+
 .account-header {
  width: 400px;
  margin: 0 auto;