diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-03 04:09:56 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-03 04:09:56 +0000 |
| commit | fbfedf0084733aacde978a468f7f73cb4e0de1dc (patch) | |
| tree | 303e43c00ba868f33b34bba18f91f2dc00b3ef6f | |
| parent | 9825a857f3d7c5d4dfc7635da90410c5e51f7374 (diff) | |
| parent | 15c4088a683b17dbc43d7374676b277f539057da (diff) | |
Merge branch 'fix/attachment-css' into 'develop'
Make image orientation consistent on FF, fix videos w/ modal
See merge request pleroma/pleroma-fe!926
| -rw-r--r-- | src/components/attachment/attachment.vue | 3 | ||||
| -rw-r--r-- | src/components/media_modal/media_modal.vue | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index ec326c45..af16e302 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -190,6 +190,7 @@ .video { width: 100%; + height: 100%; } .play-icon { @@ -286,7 +287,7 @@ } img { - image-orientation: from-image; + image-orientation: from-image; // NOTE: only FF supports this } } } diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue index 0543e677..ab5a36a5 100644 --- a/src/components/media_modal/media_modal.vue +++ b/src/components/media_modal/media_modal.vue @@ -63,6 +63,7 @@ max-width: 90%; max-height: 90%; box-shadow: 0px 5px 15px 0 rgba(0, 0, 0, 0.5); + image-orientation: from-image; // NOTE: only FF supports this } .modal-view-button-arrow { |