logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 4acac3c38c82d613a5f7180981a66c1866d2ca47
parent: 4e3ce18703bddb138e31de63c83460d757717a3b
Author: lain <lain@soykaf.club>
Date:   Thu, 11 Jun 2020 12:48:38 +0000

Merge branch 'fix/attachment-sizing-cover-fix' into 'develop'

Fix attachment cover/contain again

See merge request pleroma/pleroma-fe!1141

Diffstat:

Msrc/components/gallery/gallery.vue1+
Msrc/components/still-image/still-image.vue10++--------
2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue @@ -78,6 +78,7 @@ video, canvas { object-fit: contain; + height: 100%; } } diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue @@ -23,13 +23,6 @@ <style lang="scss"> @import '../../_variables.scss'; -.contain-fit { - .still-image { - img { - height: 100%; - } - } -} .still-image { position: relative; @@ -38,6 +31,7 @@ width: 100%; height: 100%; display: flex; + align-items: center; &:hover canvas { display: none; @@ -45,8 +39,8 @@ img { width: 100%; + min-height: 100%; object-fit: contain; - align-self: center; } &.animated {