Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji: fix long posts having weird gradient lint
This commit is contained in:
commit
109a90ba49
4 changed files with 6 additions and 5 deletions
|
@ -36,7 +36,7 @@ import {
|
|||
faEyeSlash,
|
||||
faEye,
|
||||
faThumbtack,
|
||||
faAt,
|
||||
faAt
|
||||
} from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
library.add(
|
||||
|
|
|
@ -262,8 +262,8 @@
|
|||
class="mention-link"
|
||||
:content="replyToName"
|
||||
:url="replyProfileLink"
|
||||
:userId="status.in_reply_to_user_id"
|
||||
:userScreenName="status.in_reply_to_screen_name"
|
||||
:user-id="status.in_reply_to_user_id"
|
||||
:user-screen-name="status.in_reply_to_screen_name"
|
||||
:first-mention="false"
|
||||
/>
|
||||
<span
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
overflow-y: hidden;
|
||||
z-index: 1;
|
||||
|
||||
.text {
|
||||
.text-wrapper {
|
||||
min-height: 0;
|
||||
mask:
|
||||
linear-gradient(to top, white, transparent) bottom/100% 70px no-repeat,
|
||||
|
|
|
@ -40,13 +40,14 @@
|
|||
{{ $t("general.show_more") }}
|
||||
</button>
|
||||
<span
|
||||
class="text-wrapper"
|
||||
v-if="!hideSubjectStatus && !(singleLine && status.summary_html)"
|
||||
>
|
||||
<MentionsLine
|
||||
v-if="!mentionsOwnLine"
|
||||
:attentions="status.attentions"
|
||||
class="mentions-line"
|
||||
/>
|
||||
/>
|
||||
<RichContent
|
||||
:class="{ '-single-line': singleLine }"
|
||||
class="text media-body"
|
||||
|
|
Loading…
Add table
Reference in a new issue