From 62fd395ce2dce169193c174b359df622132d8b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Fri, 28 Aug 2020 11:58:38 +0900 Subject: [PATCH 1/2] Revert "Double the threshold for "read more" functionality (#8835)" This reverts commit 5d5d1b528eda560191b2813714c9e461fda3c9d8. --- app/javascript/mastodon/components/status_content.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index c171e7a66fbb24..42156b62973b97 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -9,7 +9,7 @@ import PollContainer from 'mastodon/containers/poll_container'; import Icon from 'mastodon/components/icon'; import { autoPlayGif } from 'mastodon/initial_state'; -const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top) +const MAX_HEIGHT = 322; // 20px * 16 (+ 2px padding at the top) export default class StatusContent extends React.PureComponent { From a692e7ab54d6c81804efba4cd790e3135f265e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Fri, 28 Aug 2020 12:20:21 +0900 Subject: [PATCH 2/2] Adjust max-height of collapsed content of status --- app/javascript/styles/mastodon/components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index a6675b8edb4cb6..2d6cbd305684e0 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -860,7 +860,7 @@ } .status__content.status__content--collapsed { - max-height: 20px * 15; // 15 lines is roughly above 500 characters + max-height: 20px * 16; // 288 CJK characters (w = 18ic, h = 16lh) } .status__content__read-more-button {