diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-12 16:14:35 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-12 16:14:35 +0000 |
| commit | 25be51e2c1d9ca7ab112682c59ffadd6d1b63276 (patch) | |
| tree | b04030b899850b503097c2df1e7fde2a13043a7f /src/components/status/status.vue | |
| parent | db6ff4824afa7adca1f3b633278e9ed033d8671d (diff) | |
| parent | 27adde9887d7205703ed461560f3272f6709b83b (diff) | |
Merge branch 'feature/accountHighlight' into 'develop'
Account highlight
See merge request pleroma/pleroma-fe!285
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index b871d7fe..e2fb5d36 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -8,7 +8,7 @@ </div> </template> <template v-else> - <div v-if="retweet && !noHeading" class="media container retweet-info"> + <div v-if="retweet && !noHeading" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info"> <StillImage v-if="retweet" class='avatar' :src="statusoid.user.profile_image_url_original"/> <div class="media-body faint"> <a v-if="retweeterHtml" :href="statusoid.user.statusnet_profile_url" style="font-weight: bold;" :title="'@'+statusoid.user.screen_name" v-html="retweeterHtml"></a> @@ -18,7 +18,7 @@ </div> </div> - <div class="media status"> + <div :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet }]" :style="[ userStyle ]" class="media status"> <div v-if="!noHeading" class="media-left"> <a :href="status.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> <StillImage class='avatar' :class="{'avatar-compact': compact}" :src="status.user.profile_image_url_original"/> @@ -317,7 +317,7 @@ .retweet-info { padding: 0.4em 0.6em 0 0.6em; - margin: 0 0 -0.5em 0; + margin: 0; .avatar { border-radius: $fallback--avatarAltRadius; border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius); @@ -429,6 +429,9 @@ .status { display: flex; padding: 0.6em; + &.is-retweet { + padding-top: 0.1em; + } } .status-conversation:last-child { |