Skip to content

Commit 183d8f6

Browse files
committed
feat(conversation-list): loading more in conversation list
1 parent d436eb1 commit 183d8f6

File tree

2 files changed

+41
-2
lines changed

2 files changed

+41
-2
lines changed

themes/default/_variables.scss

+8-1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,13 @@ $conversation-header-actions-margin: 0 0 0 0.5em;
276276
// Colors
277277
$conversation-list-color: $color-text !default;
278278
$conversation-list-bg-color: transparent !default;
279+
$conversation-list-loading-more-bg-color: transparent !default;
280+
281+
// Sizes
282+
$conversation-list-loading-more-height: 1.2em !default;
283+
284+
// Spacing
285+
$conversation-list-loading-more-padding: 2px 0 !default;
279286

280287
// Expansion panel
281288
//
@@ -650,7 +657,7 @@ $message-list-loading-more-height: 1.2em !default;
650657

651658
// Spacing
652659
$message-list-scroll-wrapper-padding: 0 1.2em 0 0.8em !default;
653-
$message-list-loading-more-padding: 2px 0;
660+
$message-list-loading-more-padding: 2px 0 !default;
654661
$message-list-message-separator-margin-top: 1.2em !default;
655662

656663
// Message separator

themes/default/components/_conversation-list.scss

+33-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,39 @@
1414
color: $conversation-list-color;
1515
background-color: $conversation-list-bg-color;
1616

17-
& > ul {
17+
& > div > ul {
1818
@include reset-list;
1919
}
20+
21+
&__loading-more {
22+
box-sizing: content-box;
23+
@include flex-row;
24+
justify-content: center;
25+
position:absolute;
26+
background-color: $conversation-list-loading-more-bg-color;
27+
padding: $conversation-list-loading-more-padding;
28+
bottom:0;
29+
left:0;
30+
right:0;
31+
height: $conversation-list-loading-more-height;
32+
z-index: 1;
33+
34+
.#{$prefix}-loader {
35+
width:$conversation-list-loading-more-height;
36+
height:$conversation-list-loading-more-height;
37+
}
38+
.#{$prefix}-loader::before,
39+
.#{$prefix}-loader::after
40+
{
41+
width:100%;
42+
height:100%;
43+
}
44+
45+
}
46+
47+
// Perfect scrollbar fix to hide loading more indicator
48+
.ps__rail-y {
49+
z-index:2;
50+
}
51+
2052
}

0 commit comments

Comments
 (0)