diff options
| author | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
| commit | 54e7e0e31babbfb0c4ebc2e1a73012e1b1890231 (patch) | |
| tree | 7533728f9f115f877806694960dcaeb48d28dbd7 /src/components/user_card/user_card.vue | |
| parent | 18ae7bd5f366598d46a65e9da1312c98f7bb00e7 (diff) | |
| parent | 3cd1deb133926281920f10c1ddd6eb694c09f44d (diff) | |
merge develop and fix conflicts AGAIN
Diffstat (limited to 'src/components/user_card/user_card.vue')
| -rw-r--r-- | src/components/user_card/user_card.vue | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 2a590889..35b27319 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -1,7 +1,7 @@ <template> <div class="card"> <a href="#"> - <StillImage @click.prevent.native="toggleUserExpanded" class="avatar" :src="user.profile_image_url"/> + <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/> </a> <div class="usercard" v-if="userExpanded"> <user-card-content :user="user" :switcher="false"></user-card-content> @@ -69,11 +69,7 @@ border-bottom-color: var(--border, $fallback--border); .avatar { - margin-top: 0.2em; - width:32px; - height: 32px; - border-radius: $fallback--avatarAltRadius; - border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius); + padding: 0; } } |