From a8149a4de707f34481041257c9a7285832139929 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 13 Aug 2020 10:05:37 +0200 Subject: Fix styling of display names and account handles, make it closer to upstream --- .../flavours/glitch/styles/components/index.scss | 16 ---------------- app/javascript/flavours/glitch/styles/statuses.scss | 4 ---- app/views/statuses/_simple_status.html.haml | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 843f40ec0..2231874bc 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -360,23 +360,7 @@ } strong { - height: 18px; - font-size: 16px; - font-weight: 500; - line-height: 18px; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - - span { display: block; - height: 18px; - font-size: 15px; - line-height: 18px; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; } > a:hover { diff --git a/app/javascript/flavours/glitch/styles/statuses.scss b/app/javascript/flavours/glitch/styles/statuses.scss index a71bb2552..982a1ab9a 100644 --- a/app/javascript/flavours/glitch/styles/statuses.scss +++ b/app/javascript/flavours/glitch/styles/statuses.scss @@ -222,10 +222,6 @@ padding: 6px 0; padding-right: 25px; margin: initial; - - .display-name strong { - display: inline; - } } .status__avatar { diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index d6ab7a837..f2b6866e9 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -17,7 +17,7 @@ %span.display-name %bdi %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay) -   + = ' ' %span.display-name__account = acct(status.account) = fa_icon('lock') if status.account.locked? -- cgit