moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix styling

This commit is contained in:
Edijs 2019-02-12 09:00:09 -07:00
parent dd1b256005
commit 5d0e51cae3
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.scss
View File

@ -733,3 +733,7 @@ nav {
width: 100%; width: 100%;
} }
} }
.btn.btn-default {
min-height: 28px;
}

2
src/components/status/status.vue
View File

@ -552,7 +552,7 @@ a.unmute {
.timeline > { .timeline > {
.status-el:last-child { .status-el:last-child {
border-bottom: 0 0 $fallback--panelRadius $fallback--panelRadius; border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius); border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
border-bottom: none; border-bottom: none;
} }

17
src/components/user_card/user_card.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="card"> <div class="card">
<router-link :to="userProfileLink(user)"> <router-link :to="userProfileLink(user)">
<UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/> <UserAvatar class="avatar" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
</router-link> </router-link>
<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>
@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="follow-box"> <div class="follow-box">
<span class="follows-you" v-if="showFollows && user.follows_you"> <span class="faint" v-if="showFollows && user.follows_you">
{{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }} {{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
</span> </span>
<button <button
@ -97,27 +97,16 @@
padding: 0; padding: 0;
} }
.avatar.still-image.avatar-compact {
width: 48px;
height: 48px;
}
.follow-box { .follow-box {
width: 15em; width: 15em;
text-align: center; text-align: center;
position: relative; position: relative;
.follows-you { .btn {
color: $fallback--link;
color: var(--link, $fallback--link);
}
button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
padding: 3px;
} }
} }
} }