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

more fixes

Browse source
This commit is contained in:
Henry Jameson 2020-08-04 19:08:49 +03:00
parent 4c8e9bc0c2
commit 2a1c9e094c
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/components/status/status.scss
View file

@ -58,7 +58,7 @@ $status-margin: 0.75em;
margin-bottom: $status-margin; margin-bottom: $status-margin;
} }
.user-name { .status-username {
white-space: nowrap; white-space: nowrap;
font-size: 14px; font-size: 14px;
overflow: hidden; overflow: hidden;
@ -143,10 +143,13 @@ $status-margin: 0.75em;
} }
} }
.reply-to-popover { & .reply-to-popover,
& .reply-to-no-popover {
min-width: 0; min-width: 0;
margin-right: 0.4em; margin-right: 0.4em;
}
.reply-to-popover {
&:hover { &:hover {
border-bottom: 1px solid var(--faint); border-bottom: 1px solid var(--faint);
} }
@ -273,7 +276,7 @@ $status-margin: 0.75em;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
& .user-name, & .status-username,
& .mute-thread, & .mute-thread,
& .mute-words { & .mute-words {
word-wrap: normal; word-wrap: normal;
@ -281,16 +284,17 @@ $status-margin: 0.75em;
white-space: nowrap; white-space: nowrap;
} }
& .user-name, & .status-username,
& .mute-words { & .mute-words {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.user-name { .status-username {
font-weight: normal; font-weight: normal;
flex: 0 1 auto; flex: 0 1 auto;
margin-right: 0.2em; margin-right: 0.2em;
font-size: smaller;
} }
.mute-thread { .mute-thread {
@ -313,6 +317,11 @@ $status-margin: 0.75em;
} }
} }
.reply-form {
padding-top: 0;
padding-bottom: 0;
}
.reply-body { .reply-body {
flex: 1; flex: 1;
} }

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

@ -17,7 +17,7 @@
</div> </div>
<template v-if="muted && !isPreview"> <template v-if="muted && !isPreview">
<div class="status-csontainer muted"> <div class="status-csontainer muted">
<small class="user-name"> <small class="status-username">
<i <i
v-if="muted && retweet" v-if="muted && retweet"
class="button-icon icon-retweet" class="button-icon icon-retweet"
@ -73,7 +73,7 @@
/> />
<div class="right-side faint"> <div class="right-side faint">
<span <span
class="user-name repeater-name" class="status-username repeater-name"
:title="retweeter" :title="retweeter"
> >
<router-link <router-link
@ -131,13 +131,13 @@
<div class="heading-left"> <div class="heading-left">
<h4 <h4
v-if="status.user.name_html" v-if="status.user.name_html"
class="user-name" class="status-username"
:title="status.user.name" :title="status.user.name"
v-html="status.user.name_html" v-html="status.user.name_html"
/> />
<h4 <h4
v-else v-else
class="user-name" class="status-username"
:title="status.user.name" :title="status.user.name"
> >
{{ status.user.name }} {{ status.user.name }}
@ -229,7 +229,7 @@
</StatusPopover> </StatusPopover>
<span <span
v-else v-else
class="reply-to" class="reply-to-no-popover"
> >
<span class="reply-to-text">{{ $t('status.reply_to') }}</span> <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
</span> </span>
@ -357,7 +357,7 @@
</div> </div>
<div <div
v-if="replying" v-if="replying"
class="status-container" class="status-container reply-form"
> >
<PostStatusForm <PostStatusForm
class="reply-body" class="reply-body"