aboutsummaryrefslogtreecommitdiff
path: root/src/components/status/status.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-03-07 16:38:45 +0000
committerShpuld Shpludson <shp@cock.li>2019-03-07 16:38:45 +0000
commit09736691ea79e66c9e41d6f723384769088eb2d0 (patch)
tree196547dfc320ee2ee1173d6d807271e2c1f2fb09 /src/components/status/status.vue
parent82cd1252b58cce7fd32aafb89a21865715c23eb3 (diff)
parent5f51fe897dcd7d32c46a67a8d31c8b4ffc8858b2 (diff)
Merge branch '420-redo-user-card-content' into 'develop'
Re-do UserCardContent Component CSS Closes #420 See merge request pleroma/pleroma-fe!642
Diffstat (limited to 'src/components/status/status.vue')
-rw-r--r--src/components/status/status.vue7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4dd20362..1f6d0325 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -31,9 +31,7 @@
</router-link>
</div>
<div class="status-body">
- <div class="usercard" v-if="userExpanded">
- <user-card-content :user="status.user" :switcher="false"></user-card-content>
- </div>
+ <UserCard :user="status.user" :rounded="true" :bordered="true" class="status-usercard" v-if="userExpanded"/>
<div v-if="!noHeading" class="media-heading">
<div class="heading-name-row">
<div class="name-and-account-name">
@@ -248,8 +246,7 @@ $status-margin: 0.75em;
padding: 0;
}
- .usercard {
- margin: 0;
+ .status-usercard {
margin-bottom: $status-margin;
}