diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/avatar_list/avatar_list.vue | 35 | ||||
| -rw-r--r-- | src/components/conversation/conversation.js | 10 |
2 files changed, 9 insertions, 36 deletions
diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue index fd6d8336..5df62ce5 100644 --- a/src/components/avatar_list/avatar_list.vue +++ b/src/components/avatar_list/avatar_list.vue @@ -1,6 +1,6 @@ <template> - <ul class="avatars" :class="{ 'transparent-avatar': slicedAvatars.length == 15 }"> - <li class="avatars-item" v-for="avatar in slicedAvatars" :key="avatar.id"> + <ul class="avatars"> + <li class="avatars-item" v-for="(avatar, index) in slicedAvatars" :key="`avatar-${index}`"> <UserAvatar :src="avatar.profile_image_url" class="avatars-img" /> </li> </ul> @@ -18,37 +18,16 @@ flex-direction: row-reverse; &-item { - height: 30px; + height: 25px; margin: 0; padding: 0; width: 15px; .avatars-img { - border-radius: 50%; - height: 30px; - width: 30px; - line-height: 30px; - background-color: $main-background; - } - } -} - -.transparent-avatar { - .avatars-item { - &:first-child { - position: relative; - - .avatars-img { - &::after { - content: ''; - position: absolute; - width: 100%; - height: 100%; - background-color: rgba(255, 255, 255, 0.7); - left: 0; - top: 0; - } - } + border-radius: $fallback--avatarAltRadius; + border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius); + height: 25px !important; + width: 25px !important; } } } diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index ba90746e..115ac640 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -121,8 +121,8 @@ const conversation = { this.$store.state.api.backendInteractor.fetchConversation({id: this.status.id}) .then(({ancestors, descendants}) => { const ancestorId = ancestors.length ? ancestors[0].id : this.status.id - this.fetchFavoritedByUsers(ancestorId) - this.fetchRebloggedByUsers(ancestorId) + this.$store.dispatch('fetchFavoritedByUsers', { id: ancestorId }) + this.$store.dispatch('fetchRebloggedByUsers', { id: ancestorId }) this.$store.dispatch('addNewStatuses', { statuses: ancestors }) this.$store.dispatch('addNewStatuses', { statuses: descendants }) }) @@ -151,12 +151,6 @@ const conversation = { if (!this.expanded) { this.setHighlight(null) } - }, - fetchFavoritedByUsers (id) { - this.$store.dispatch('fetchFavoritedByUsers', { id }) - }, - fetchRebloggedByUsers (id) { - this.$store.dispatch('fetchRebloggedByUsers', { id }) } } } |