aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-12 12:58:01 +0200
committerlain <lain@soykaf.club>2020-06-12 12:58:01 +0200
commit33c1adbef4b5513605b21797860e7fd60070864c (patch)
treec19fcc0493e3b73e31dc03e6d6ec1b60b52f13ba /src/components
parent98819ae32c6f3962df955ee280cd6cc271625852 (diff)
parent48365819d14d80d2aeb7174bca05bf76eee2e8e0 (diff)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into notification-unification-experiments
Diffstat (limited to 'src/components')
-rw-r--r--src/components/gallery/gallery.vue1
-rw-r--r--src/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
index 7abc2161..1ffa7b3c 100644
--- 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
index 08af26f6..f2ddeb7b 100644
--- 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 {