Skip to content
Snippets Groups Projects
Commit 0824bc14 authored by Anton Georgiev's avatar Anton Georgiev Committed by GitHub
Browse files

Merge pull request #4503 from oswaldoacauan/user-list-scroll-bg

[HTML5] Fix user-list scroll shadow and message list max height
parents a850d1c9 34106e6d
No related branches found
No related tags found
No related merge requests found
......@@ -7,6 +7,7 @@
$unread-messages-bg: $color-danger;
$user-list-text: $color-gray;
$user-list-bg: #F3F6F9;
$user-thumbnail-border: $color-gray-light;
$user-thumbnail-text: $user-thumbnail-border;
......@@ -86,6 +87,7 @@ $user-icons-color-hover: $color-gray;
}
.messages {
max-height: 30vh;
}
.participants {
......
......@@ -3,11 +3,11 @@
.content {
@extend %flex-column;
flex-grow: 9;
flex-grow: 1;
overflow: hidden;
}
.scrollableList {
@extend %customListFocus;
@include scrollbox-vertical();
@include scrollbox-vertical($user-list-bg);
}
......@@ -126,7 +126,7 @@ class UserMessages extends Component {
transitionEnterTimeout={0}
transitionLeaveTimeout={0}
component="div"
className={cx(styles.chatsList, styles.scrollableList)}
className={cx(styles.chatsList)}
>
<div ref={(ref) => { this._msgItems = ref; }}>
{openChats.map(chat => (
......
......@@ -203,7 +203,7 @@ class UserParticipants extends Component {
transitionEnterTimeout={0}
transitionLeaveTimeout={0}
component="div"
className={cx(styles.participantsList, styles.scrollableList)}
className={cx(styles.participantsList)}
>
<div ref={(ref) => { this.refScrollItems = ref; }}>
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment