Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix class ordering issues related to avatar

Browse source
This commit is contained in:
taehoon 2019-02-02 15:50:25 -05:00
parent 0b66a43a83
commit 4833f79cc2
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/status/status.vue
View file

@ -405,7 +405,7 @@
padding: 0.4em 0.6em 0 0.6em; padding: 0.4em 0.6em 0 0.6em;
margin: 0; margin: 0;
.avatar { .avatar.still-image {
border-radius: $fallback--avatarAltRadius; border-radius: $fallback--avatarAltRadius;
border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius); border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
margin-left: 28px; margin-left: 28px;
@ -546,7 +546,7 @@ a.unmute {
@media all and (max-width: 800px) { @media all and (max-width: 800px) {
.status-el { .status-el {
.retweet-info { .retweet-info {
.avatar { .avatar.still-image {
margin-left: 20px; margin-left: 20px;
} }
} }
@ -555,7 +555,7 @@ a.unmute {
max-width: 100%; max-width: 100%;
} }
.status .avatar { .status .avatar.still-image {
width: 40px; width: 40px;
height: 40px; height: 40px;

6
src/components/user_card/user_card.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="card"> <div class="card">
<a href="#"> <a href="#">
<UserAvatar @click.prevent="toggleUserExpanded" :src="user.profile_image_url"/> <UserAvatar :compact="true" @click.prevent="toggleUserExpanded" :src="user.profile_image_url"/>
</a> </a>
<div class="usercard" v-if="userExpanded"> <div class="usercard" v-if="userExpanded">
<user-card-content :user="user" :switcher="false"></user-card-content> <user-card-content :user="user" :switcher="false"></user-card-content>
@ -70,10 +70,6 @@
.avatar { .avatar {
margin-top: 0.2em; margin-top: 0.2em;
width:32px;
height: 32px;
border-radius: $fallback--avatarAltRadius;
border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
} }
} }