From 25f4e44580da3f948b10df6d18b434f15e931fe0 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Wed, 15 Apr 2026 14:06:26 +0200 Subject: [PATCH] [Glitch] Prevent text wrapping in Badge component Port 298fc7ce4c86fd3a723937ae47090eda3b70ddce to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/components/badge/index.tsx | 6 ++++-- .../flavours/glitch/components/badge/styles.module.scss | 8 +++++++- .../flavours/glitch/styles/mastodon/components.scss | 7 ------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/javascript/flavours/glitch/components/badge/index.tsx b/app/javascript/flavours/glitch/components/badge/index.tsx index 5f2120b64c..c87985b871 100644 --- a/app/javascript/flavours/glitch/components/badge/index.tsx +++ b/app/javascript/flavours/glitch/components/badge/index.tsx @@ -52,8 +52,10 @@ export const Badge: FC = ({ data-account-role-id={roleId} > {icon} - {label} - {domain && {domain}} + + {label} + {domain && {domain}} + ); diff --git a/app/javascript/flavours/glitch/components/badge/styles.module.scss b/app/javascript/flavours/glitch/components/badge/styles.module.scss index 59c738b9cc..d359bc38eb 100644 --- a/app/javascript/flavours/glitch/components/badge/styles.module.scss +++ b/app/javascript/flavours/glitch/components/badge/styles.module.scss @@ -7,9 +7,9 @@ gap: 4px; border-radius: 8px; align-items: center; - overflow-wrap: anywhere; > svg { + flex-shrink: 0; width: auto; height: 17px; fill: currentColor; @@ -26,6 +26,12 @@ } } +.content { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + .domain { opacity: 0.75; letter-spacing: 0; diff --git a/app/javascript/flavours/glitch/styles/mastodon/components.scss b/app/javascript/flavours/glitch/styles/mastodon/components.scss index 57d0b7d5ab..453a6c662d 100644 --- a/app/javascript/flavours/glitch/styles/mastodon/components.scss +++ b/app/javascript/flavours/glitch/styles/mastodon/components.scss @@ -10998,14 +10998,7 @@ noscript { } &__source { - overflow: hidden; - white-space: nowrap; cursor: help; - - > span { - overflow: hidden; - text-overflow: ellipsis; - } } }