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,
|
faEyeSlash,
|
||||||
faEye,
|
faEye,
|
||||||
faThumbtack,
|
faThumbtack,
|
||||||
faAt,
|
faAt
|
||||||
} from '@fortawesome/free-solid-svg-icons'
|
} from '@fortawesome/free-solid-svg-icons'
|
||||||
|
|
||||||
library.add(
|
library.add(
|
||||||
|
|
|
@ -262,8 +262,8 @@
|
||||||
class="mention-link"
|
class="mention-link"
|
||||||
:content="replyToName"
|
:content="replyToName"
|
||||||
:url="replyProfileLink"
|
:url="replyProfileLink"
|
||||||
:userId="status.in_reply_to_user_id"
|
:user-id="status.in_reply_to_user_id"
|
||||||
:userScreenName="status.in_reply_to_screen_name"
|
:user-screen-name="status.in_reply_to_screen_name"
|
||||||
:first-mention="false"
|
:first-mention="false"
|
||||||
/>
|
/>
|
||||||
<span
|
<span
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
|
||||||
.text {
|
.text-wrapper {
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
mask:
|
mask:
|
||||||
linear-gradient(to top, white, transparent) bottom/100% 70px no-repeat,
|
linear-gradient(to top, white, transparent) bottom/100% 70px no-repeat,
|
||||||
|
|
|
@ -40,13 +40,14 @@
|
||||||
{{ $t("general.show_more") }}
|
{{ $t("general.show_more") }}
|
||||||
</button>
|
</button>
|
||||||
<span
|
<span
|
||||||
|
class="text-wrapper"
|
||||||
v-if="!hideSubjectStatus && !(singleLine && status.summary_html)"
|
v-if="!hideSubjectStatus && !(singleLine && status.summary_html)"
|
||||||
>
|
>
|
||||||
<MentionsLine
|
<MentionsLine
|
||||||
v-if="!mentionsOwnLine"
|
v-if="!mentionsOwnLine"
|
||||||
:attentions="status.attentions"
|
:attentions="status.attentions"
|
||||||
class="mentions-line"
|
class="mentions-line"
|
||||||
/>
|
/>
|
||||||
<RichContent
|
<RichContent
|
||||||
:class="{ '-single-line': singleLine }"
|
:class="{ '-single-line': singleLine }"
|
||||||
class="text media-body"
|
class="text media-body"
|
||||||
|
|
Loading…
Add table
Reference in a new issue