diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-11-02 05:36:42 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-11-02 05:36:42 +0000 |
| commit | 5254fdba75fc8d645c2235902a39b79c45f9aa6f (patch) | |
| tree | ac329a5fc0448d804d5aa8d77e137b00e64a4491 /src/components/chat_message | |
| parent | 590f8e17544969b1fc2456b3724e85b16cf81bdd (diff) | |
| parent | 78e5a639228ba846e38ae722590aec1310275c79 (diff) | |
Merge branch 'optimistic-chat-posting' into 'develop'
Optimistic / nonblocking message posting for chats
See merge request pleroma/pleroma-fe!1228
Diffstat (limited to 'src/components/chat_message')
| -rw-r--r-- | src/components/chat_message/chat_message.scss | 13 | ||||
| -rw-r--r-- | src/components/chat_message/chat_message.vue | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss index 53ca7cce..5af744a3 100644 --- a/src/components/chat_message/chat_message.scss +++ b/src/components/chat_message/chat_message.scss @@ -101,6 +101,19 @@ } } + .pending { + .status-content.media-body, .created-at { + color: var(--faint); + } + } + + .error { + .status-content.media-body, .created-at { + color: $fallback--cRed; + color: var(--badgeNotification, $fallback--cRed); + } + } + .incoming { a { color: var(--chatMessageIncomingLink, $fallback--link); diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue index d5b8bb9e..3849ab6e 100644 --- a/src/components/chat_message/chat_message.vue +++ b/src/components/chat_message/chat_message.vue @@ -32,7 +32,7 @@ > <div class="media status" - :class="{ 'without-attachment': !hasAttachment }" + :class="{ 'without-attachment': !hasAttachment, 'pending': chatViewItem.data.pending, 'error': chatViewItem.data.error }" style="position: relative" @mouseenter="hovered = true" @mouseleave="hovered = false" |