diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue
index 99d58045..67fbf7f7 100644
--- a/assets/components/actors/actor.vue
+++ b/assets/components/actors/actor.vue
@@ -318,13 +318,14 @@
photosExpanded = state"
>
@@ -683,10 +684,6 @@ export default {
margin: 0 0 1rem 0;
}
-.photos {
- background: var(--background-dim);
-}
-
.profile-social {
display: none;
}
@@ -696,6 +693,7 @@ export default {
}
.scroll {
+ background: var(--background-dim);
border-bottom: solid 1px var(--shadow-hint);
}
diff --git a/assets/components/actors/photos.vue b/assets/components/actors/photos.vue
index 0b680c29..6feddcde 100644
--- a/assets/components/actors/photos.vue
+++ b/assets/components/actors/photos.vue
@@ -19,7 +19,7 @@
:title="actor.avatar.credit && `© ${actor.avatar.credit}`"
loading="lazy"
class="avatar photo"
- @load="$parent.$emit('load')"
+ @load="$emit('load', $event)"
>
@@ -37,7 +37,7 @@
:title="`© ${photo.credit || photo.entity.name}`"
loading="lazy"
class="photo"
- @load="$parent.$emit('load')"
+ @load="$emit('load', $event)"
>
@@ -59,6 +59,7 @@ export default {
default: null,
},
},
+ emits: ['load'],
computed: {
sfw,
photos,
@@ -73,7 +74,6 @@ export default {
display: flex;
box-sizing: border-box;
padding: .5rem 1rem;
- margin: 0 1rem 0 0;
font-size: 0;
&.expanded {
@@ -100,7 +100,11 @@ export default {
}
.photo-link {
- margin: 0 .5rem 0 0;
+ padding: 0 .5rem 0 0;
+
+ &:last-child {
+ padding: 0 1rem 0 0;
+ }
}
.photo {
diff --git a/assets/components/scroll/scroll.vue b/assets/components/scroll/scroll.vue
index 0baaf4b8..91a6e583 100644
--- a/assets/components/scroll/scroll.vue
+++ b/assets/components/scroll/scroll.vue
@@ -84,7 +84,7 @@ function mounted() {
this.updateScroll();
}
-function beforeDestroy() {
+function beforeUnmount() {
this.$refs.content.removeEventListener('scroll', this.updateScroll);
window.removeEventListener('resize', this.updateScroll);
@@ -121,7 +121,7 @@ export default {
},
mounted,
updated,
- beforeDestroy,
+ beforeUnmount,
methods: {
scroll,
loaded,
@@ -133,15 +133,11 @@ export default {