diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-12 17:52:19 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-12 17:52:19 -0500 |
commit | f8e934f95551179de48a716d4f148bb7bec638d1 (patch) | |
tree | 79ca73d8d3346dc5ee5a38bce919e43e3c4e99bd /app/javascript/styles | |
parent | 22f2750578c64af4e886b0cc704aa0be4ee209b0 (diff) | |
parent | 051b649628d8039ff15f0c035c6f8fe5dbf045d6 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index cd0dbbab8..ba1c36d07 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3422,8 +3422,12 @@ a.status-card { img, canvas, video { - max-width: 100vw; - max-height: 100vh; + max-width: 100%; + /* + put margins on top and bottom of image to avoid the screen coverd by + image. + */ + max-height: 80%; width: auto; height: auto; margin: auto; @@ -3435,11 +3439,6 @@ a.status-card { background: url('~images/void.png') repeat; object-fit: contain; } - - .react-swipeable-view-container { - width: 100vw; - height: 100%; - } } .media-modal__closer { @@ -4315,18 +4314,16 @@ a.status-card { display: block; text-decoration: none; color: $ui-secondary-color; - height: 100%; line-height: 0; &, img { + height: 100%; width: 100%; } img { - position: relative; object-fit: cover; - height: auto; } } @@ -5076,6 +5073,12 @@ noscript { } } +.focal-point-modal { + max-width: 80vw; + max-height: 80vh; + position: relative; +} + .focal-point { position: relative; cursor: pointer; @@ -5085,6 +5088,14 @@ noscript { cursor: move; } + img { + max-width: 80vw; + max-height: 80vh; + width: auto; + height: auto; + margin: auto; + } + &__reticle { position: absolute; width: 100px; |