From cc8448565083031ff6bb7afaecbf43f26eff608f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 26 Apr 2022 18:50:11 +0300 Subject: [PATCH 1/2] improvements to chats view --- src/App.scss | 8 ++++++-- src/components/chat/chat.scss | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/App.scss b/src/App.scss index d319aa52d..018d03132 100644 --- a/src/App.scss +++ b/src/App.scss @@ -140,7 +140,6 @@ nav { } #main-scroller { - margin-top: var(--navbar-height); grid-area: content; position: relative; } @@ -206,13 +205,18 @@ nav { row-gap: var(--___columnMargin); align-content: start; + &:not(.-scrollable) { + margin-top: var(--navbar-height); + } + &:hover { z-index: 2; } &.-full-height { - margin-top: 0; margin-bottom: 0; + padding-top: 0; + padding-bottom: 0; } &.-scrollable { diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss index 90926904b..9c98871d3 100644 --- a/src/components/chat/chat.scss +++ b/src/components/chat/chat.scss @@ -1,9 +1,6 @@ .chat-view { display: flex; height: 100%; - // Stick the form to the top/bottom of screen - margin-bottom: calc(var(--___columnMargin) / -2); - margin-top: calc(var(--___columnMargin) / -2); .chat-view-inner { height: auto; @@ -23,8 +20,6 @@ margin: 0 0 0 0; border-radius: 10px 10px 0 0; border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0; - margin-bottom: calc(var(--___columnMargin) * -1); - padding-bottom: var(--___columnMargin); &::after { border-radius: 0; From e5be00dae14a6578c6d37bf49920eefac6fab67a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 26 Apr 2022 18:55:21 +0300 Subject: [PATCH 2/2] fix mobile version --- src/App.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/App.scss b/src/App.scss index 018d03132..d62d9ac29 100644 --- a/src/App.scss +++ b/src/App.scss @@ -294,7 +294,11 @@ nav { padding: 0; .column { - margin: 0; + margin-left: 0; + margin-right: 0; + padding-top: 0; + margin-top: var(--navbar-height); + margin-bottom: 0; } .underlay,