logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: cc8448565083031ff6bb7afaecbf43f26eff608f
parent 4e4c96dfaf5c16cb6c0e965601bbd53070f198a0
Author: Henry Jameson <me@hjkos.com>
Date:   Tue, 26 Apr 2022 18:50:11 +0300

improvements to chats view

Diffstat:

Msrc/App.scss8++++++--
Msrc/components/chat/chat.scss5-----
2 files changed, 6 insertions(+), 7 deletions(-)

diff --git 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 @@ -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;