From 9a3f90a87c721331952ed49edf0e4db592285417 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 26 Mar 2022 05:26:26 +0000 Subject: [PATCH 1/2] Stop Beta pill label from breaking Closes https://github.com/vector-im/element-web/issues/21566 This commit ensures word break is not used for beta pill label in CJK languages Signed-off-by: Suguru Hirahara --- res/css/views/beta/_BetaCard.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss index 80a70ad0d62..30aa155faf4 100644 --- a/res/css/views/beta/_BetaCard.scss +++ b/res/css/views/beta/_BetaCard.scss @@ -101,9 +101,10 @@ limitations under the License. font-size: 12px; font-weight: $font-semi-bold; line-height: 15px; - color: #FFFFFF; + color: #fff; display: inline-block; vertical-align: text-bottom; + word-break: keep-all; // avoid multiple lines on CJK language &.mx_AccessibleButton { cursor: pointer; From d98f7aca1fb63bb2fb3249e20d13ad13d66409e3 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Mon, 28 Mar 2022 08:10:48 +0000 Subject: [PATCH 2/2] Revert the unrelated change Signed-off-by: Suguru Hirahara --- res/css/views/beta/_BetaCard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss index 30aa155faf4..9e8b6224912 100644 --- a/res/css/views/beta/_BetaCard.scss +++ b/res/css/views/beta/_BetaCard.scss @@ -101,7 +101,7 @@ limitations under the License. font-size: 12px; font-weight: $font-semi-bold; line-height: 15px; - color: #fff; + color: #FFFFFF; display: inline-block; vertical-align: text-bottom; word-break: keep-all; // avoid multiple lines on CJK language