Merge branch 'threecolumn' into shigusegubu-vue3

* threecolumn:
  fix chats button alignment
  reduce chats jumpiness
This commit is contained in:
Henry Jameson 2022-04-12 17:18:10 +03:00
commit 81e39d3447
3 changed files with 18 additions and 16 deletions

View file

@ -13,12 +13,13 @@
}
.chat-view-body {
box-sizing: border-box;
background-color: var(--chatBg, $fallback--bg);
display: flex;
flex-direction: column;
width: 100%;
overflow: visible;
min-height: 100%;
min-height: calc(100vh - var(--navbar-height));
margin: 0 0 0 0;
border-radius: 10px 10px 0 0;
border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0;
@ -46,7 +47,6 @@
}
.chat-view-heading {
align-items: center;
justify-content: space-between;
display: flex;
z-index: 2;
@ -55,11 +55,11 @@
}
.go-back-button {
cursor: pointer;
width: 28px;
text-align: center;
padding: 0.6em;
margin: -0.6em 0.6em -0.6em -0.6em;
padding: 0 0.7em;
line-height: 100%;
height: 100%;
align-self: stretch;
}
.jump-to-bottom-button {

View file

@ -9,15 +9,15 @@
ref="header"
class="panel-heading -sticky chat-view-heading mobile-hidden"
>
<a
class="go-back-button"
<button
class="button-unstyled go-back-button"
@click="goBack"
>
<FAIcon
size="lg"
icon="chevron-left"
/>
</a>
</button>
<div class="title text-center">
<ChatTitle
:user="recipient"

View file

@ -4,13 +4,13 @@
:title="title"
>
<router-link
class="avatar-container"
v-if="withAvatar && user"
:to="getUserProfileLink(user)"
>
<UserAvatar
class="titlebar-avatar"
:user="user"
width="23px"
height="23px"
/>
</router-link>
<RichContent
@ -32,7 +32,6 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
align-items: center;
--emoji-size: 14px;
@ -45,11 +44,14 @@
overflow: hidden;
}
.Avatar {
width: 23px;
height: 23px;
margin-right: 0.5em;
.avatar-container {
align-self: center;
}
.titlebar-avatar {
margin-right: 0.5em;
height: 1.5em;
width: 1.5em;
border-radius: $fallback--avatarAltRadius;
border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);