diff options
| author | Edijs <iamedijs@hotmail.com> | 2019-02-12 09:00:09 -0700 |
|---|---|---|
| committer | Edijs <iamedijs@hotmail.com> | 2019-02-12 09:00:09 -0700 |
| commit | 5d0e51cae33b29c65cb89c01c087af71b4885b6a (patch) | |
| tree | 290ac8a0137ce481466c2abd991db9db4a8b3e02 | |
| parent | dd1b25600564e3047dc3355aaa0e88c6b8814ddd (diff) | |
Fix styling
| -rw-r--r-- | src/App.scss | 4 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 | ||||
| -rw-r--r-- | src/components/user_card/user_card.vue | 17 |
3 files changed, 8 insertions, 15 deletions
diff --git a/src/App.scss b/src/App.scss index 1eaed6ea..a43b84a7 100644 --- a/src/App.scss +++ b/src/App.scss @@ -733,3 +733,7 @@ nav { width: 100%; } } + +.btn.btn-default { + min-height: 28px; +} diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 7b914291..ef4ee843 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -552,7 +552,7 @@ a.unmute { .timeline > { .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-bottom: none; } diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 99eecf7c..1fab2323 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"> <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> <div class="usercard" v-if="userExpanded"> <user-card-content :user="user" :switcher="false"></user-card-content> @@ -18,7 +18,7 @@ </div> </div> <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') }} </span> <button @@ -97,27 +97,16 @@ padding: 0; } - .avatar.still-image.avatar-compact { - width: 48px; - height: 48px; - } - .follow-box { width: 15em; text-align: center; position: relative; - .follows-you { - color: $fallback--link; - color: var(--link, $fallback--link); - } - - button { + .btn { position: absolute; bottom: 0; left: 0; width: 100%; - padding: 3px; } } } |