From 5c655b6675718e1617a2bf94c4ec75167f0a0e23 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 8 Jun 2021 17:19:38 +0300 Subject: [PATCH 1/2] lint --- src/components/status/status.js | 2 +- src/components/status/status.vue | 4 ++-- src/components/status_body/status_body.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 9b1c1b9cf..544725253 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -36,7 +36,7 @@ import { faEyeSlash, faEye, faThumbtack, - faAt, + faAt } from '@fortawesome/free-solid-svg-icons' library.add( diff --git a/src/components/status/status.vue b/src/components/status/status.vue index d62c68174..f27fbaa53 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -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" /> + /> Date: Tue, 8 Jun 2021 19:37:18 +0300 Subject: [PATCH 2/2] fix long posts having weird gradient --- src/components/status_body/status_body.scss | 2 +- src/components/status_body/status_body.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss index b65e3b278..10b4c1861 100644 --- a/src/components/status_body/status_body.scss +++ b/src/components/status_body/status_body.scss @@ -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, diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue index 421a3820d..fae2d5945 100644 --- a/src/components/status_body/status_body.vue +++ b/src/components/status_body/status_body.vue @@ -40,6 +40,7 @@ {{ $t("general.show_more") }}