From 0260693f5162ea8a73d2b359940781049a1b3e76 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 10 Jun 2021 13:22:36 +0300 Subject: [PATCH] stylistic improvements for single-line mentions --- src/components/mention_link/mention_link.scss | 2 + src/components/status/status.scss | 22 +--- src/components/status/status.vue | 122 ++++++++---------- src/components/status_body/status_body.vue | 1 - 4 files changed, 62 insertions(+), 85 deletions(-) diff --git a/src/components/mention_link/mention_link.scss b/src/components/mention_link/mention_link.scss index eed4d5be..a18475a1 100644 --- a/src/components/mention_link/mention_link.scss +++ b/src/components/mention_link/mention_link.scss @@ -32,6 +32,8 @@ & .short, & .full { + white-space: nowrap; + &::before { content: '@'; } diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 8f7fb71a..60dd8237 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -155,32 +155,17 @@ $status-margin: 0.75em; margin-right: 0.2em; } - & .heading-mentions-row, & .heading-reply-row { position: relative; align-content: baseline; font-size: 12px; - line-height: 18px; + line-height: 160%; max-width: 100%; display: flex; flex-wrap: wrap; align-items: stretch; } - .reply-to-and-accountname { - display: flex; - height: 18px; - margin-right: 0.5em; - max-width: 100%; - - .reply-to-link { - white-space: nowrap; - word-break: break-word; - text-overflow: ellipsis; - overflow-x: hidden; - } - } - & .reply-to-popover, & .reply-to-no-popover { min-width: 0; @@ -219,6 +204,7 @@ $status-margin: 0.75em; & .mentions, & .reply-to { + white-space: nowrap; position: relative; } @@ -228,8 +214,8 @@ $status-margin: 0.75em; white-space: nowrap; } - .mentions-separator { - margin-left: 0.4em; + .mentions-line { + display: inline-block; } .replies { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index e4c3a755..9e08ce85 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -221,81 +221,71 @@ -
-
- + - + {{ $t('status.reply_to') }} + + + - - {{ $t('status.reply_to') }} - + + {{ $t('status.reply_to') }} + - + + + - - + {{ $t('status.mentions') }} - - - - - {{ $t('status.mentions') }} - - - - -
+ +
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue index 3c291cf6..4df29934 100644 --- a/src/components/status_body/status_body.vue +++ b/src/components/status_body/status_body.vue @@ -54,7 +54,6 @@