From 0c8e5e21e7b5348ed28b5b2b007788b5990334db Mon Sep 17 00:00:00 2001 From: morethanwords Date: Mon, 11 Jan 2021 21:38:20 +0400 Subject: [PATCH] Fix multiselect checkbox positions Fix audio seek color Fix space between service messages --- src/components/chat/bubbles.ts | 1 + src/lib/cacheStorage.ts | 4 +- src/scss/partials/_audio.scss | 4 ++ src/scss/partials/_chat.scss | 4 +- src/scss/partials/_chatBubble.scss | 91 +++++++++++++++--------------- 5 files changed, 55 insertions(+), 49 deletions(-) diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts index cffe7ec8..69f2ff7c 100644 --- a/src/components/chat/bubbles.ts +++ b/src/components/chat/bubbles.ts @@ -1599,6 +1599,7 @@ export default class ChatBubbles { if(updatePosition) { this.renderMessagesQueue(message, bubble, reverse, loadPromises); + this.bubbleGroups.addBubble(bubble, message, reverse); } return bubble; diff --git a/src/lib/cacheStorage.ts b/src/lib/cacheStorage.ts index 3886055e..1a0fa55e 100644 --- a/src/lib/cacheStorage.ts +++ b/src/lib/cacheStorage.ts @@ -53,9 +53,9 @@ export default class CacheStorageController { } */ public getFile(fileName: string, method: 'blob' | 'json' | 'text' = 'blob'): Promise { - if(method == 'blob') { + /* if(method == 'blob') { return Promise.reject(); - } + } */ // const str = `get fileName: ${fileName}`; // console.time(str); diff --git a/src/scss/partials/_audio.scss b/src/scss/partials/_audio.scss index 5020d8e5..22038ca5 100644 --- a/src/scss/partials/_audio.scss +++ b/src/scss/partials/_audio.scss @@ -452,6 +452,10 @@ margin-left: 5px; margin-top: -1px; + &__filled { + background-color: #0089ff; + } + &__loaded { background-color: #cacaca; } diff --git a/src/scss/partials/_chat.scss b/src/scss/partials/_chat.scss index 8c8b0c2b..4277b9d2 100644 --- a/src/scss/partials/_chat.scss +++ b/src/scss/partials/_chat.scss @@ -836,11 +836,11 @@ $chat-helper-size: 39px; } .btn-icon { - margin-left: 6px; - maRgin-top: 6px; + margin: 0 5px 0 6px; color: #3f454a; height: 42px; width: 42px; + line-height: 42px; } .btn-primary { diff --git a/src/scss/partials/_chatBubble.scss b/src/scss/partials/_chatBubble.scss index aa61b812..abc9c64a 100644 --- a/src/scss/partials/_chatBubble.scss +++ b/src/scss/partials/_chatBubble.scss @@ -171,42 +171,6 @@ $bubble-margin: .25rem; } } - &.is-date { - position: sticky; - top: $bubble-margin; - //z-index: 3; - z-index: 2; - transition: opacity .3s ease; - opacity: .99999; // for safari - pointer-events: none; - - body.animation-level-0 & { - transition: none; - } - - &.is-sticky { - opacity: .00001; // for safari - - .bubbles-inner:not(.is-scrolling) & { - //transition-delay: 1.35s; - - .bubble__container { - cursor: default; - } - } - - /* .bubbles-inner.is-scrolling & { - transition-delay: 0; - } */ - } - - .chat.type-chat & .bubble__container, - .chat.type-discussion & .bubble__container { - cursor: pointer; - pointer-events: all; - } - } - &.zoom-fade /* .bubble__container */ { //transform: scale(.8) translateZ(0); transform: scale3d(.8, .8, 1); @@ -234,7 +198,7 @@ $bubble-margin: .25rem; & > &-select-checkbox { //bottom: .75rem; // * by avatar - bottom: 5px; // * by middle of one-line message + bottom: .3125rem; // * by middle of one-line message /* left: 0; top: 50%; transform: translateY(-50%); */ @@ -324,7 +288,7 @@ $bubble-margin: .25rem; &.service { //padding: 1rem 0; - padding: $bubble-margin 0; + //padding: $bubble-margin 0; max-width: var(--messages-container-width); .bubble__container { @@ -334,6 +298,43 @@ $bubble-margin: .25rem; } } + &.is-date { + position: sticky; + top: $bubble-margin; + padding-bottom: $bubble-margin; + //z-index: 3; + z-index: 2; + transition: opacity .3s ease; + opacity: .99999; // for safari + pointer-events: none; + + body.animation-level-0 & { + transition: none; + } + + &.is-sticky { + opacity: .00001; // for safari + + .bubbles-inner:not(.is-scrolling) & { + //transition-delay: 1.35s; + + .bubble__container { + cursor: default; + } + } + + /* .bubbles-inner.is-scrolling & { + transition-delay: 0; + } */ + } + + .chat.type-chat & .bubble__container, + .chat.type-discussion & .bubble__container { + cursor: pointer; + pointer-events: all; + } + } + &-beside-button { //opacity: 0; //transition: .2s opacity; @@ -374,13 +375,13 @@ $bubble-margin: .25rem; bottom: -#{$bubble-margin}; } - > .bubble-select-checkbox { - bottom: 8px; - } + /* > .bubble-select-checkbox { + bottom: .3125rem; + } */ .bubbles-inner.is-chat &.is-in { > .bubble-select-checkbox { - bottom: 7px; + bottom: .1875rem; } } } @@ -1167,13 +1168,13 @@ $bubble-margin: .25rem; } } - /* &.is-group-first .document-container { + &.is-group-first .document-container { &:first-of-type { .document-selection { - top: -4px; + top: -$bubble-margin; } } - } */ + } &.is-group-last .document-container { &:last-of-type {