From 4833f79cc2f2c43cdd8d185bf0b2cf17dc117b59 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sat, 2 Feb 2019 15:50:25 -0500
Subject: [PATCH] Fix class ordering issues related to avatar
---
src/components/status/status.vue | 6 +++---
src/components/user_card/user_card.vue | 6 +-----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a6586fa0..5f3998a4 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -405,7 +405,7 @@
padding: 0.4em 0.6em 0 0.6em;
margin: 0;
- .avatar {
+ .avatar.still-image {
border-radius: $fallback--avatarAltRadius;
border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
margin-left: 28px;
@@ -546,7 +546,7 @@ a.unmute {
@media all and (max-width: 800px) {
.status-el {
.retweet-info {
- .avatar {
+ .avatar.still-image {
margin-left: 20px;
}
}
@@ -555,7 +555,7 @@ a.unmute {
max-width: 100%;
}
- .status .avatar {
+ .status .avatar.still-image {
width: 40px;
height: 40px;
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 4f512974..57a44dfb 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="#">
- <UserAvatar @click.prevent="toggleUserExpanded" :src="user.profile_image_url"/>
+ <UserAvatar :compact="true" @click.prevent="toggleUserExpanded" :src="user.profile_image_url"/>
</a>
<div class="usercard" v-if="userExpanded">
<user-card-content :user="user" :switcher="false"></user-card-content>
@@ -70,10 +70,6 @@
.avatar {
margin-top: 0.2em;
- width:32px;
- height: 32px;
- border-radius: $fallback--avatarAltRadius;
- border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
}
}