Skip to content

Commit 69963c1

Browse files
Center stuff
1 parent 2e7b8c2 commit 69963c1

7 files changed

Lines changed: 26 additions & 27 deletions

File tree

src/components/ChannelHeader/styling/ChannelHeader.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
@include utils.header-layout;
1111

1212
.str-chat__channel-header__start {
13-
flex: 1;
14-
display: flex;
13+
justify-self: start;
14+
min-width: 0;
1515
}
1616

1717
.str-chat__channel-header__data {
1818
@include utils.header-text-layout;
19-
width: unset;
19+
justify-self: center;
20+
min-width: 0;
2021
}
2122

2223
.str-chat__channel-header__end {
23-
flex: 1;
24-
display: flex;
25-
justify-content: flex-end;
24+
justify-self: end;
25+
min-width: 0;
2626
}
2727

2828
.str-chat__channel-header__data__title,

src/components/ChannelList/styling/ChannelList.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
transform var(--str-chat__channel-list-transition-duration)
4242
var(--str-chat__channel-list-transition-easing);
4343
width: var(--str-chat__channel-list-width);
44-
@include utils.scrollable-y;
4544
background: var(--background-core-elevation-1);
4645
color: var(--text-primary);
4746
border-inline-end: 1px solid var(--border-core-default);
@@ -54,6 +53,8 @@
5453
.str-chat__channel-list-inner__main {
5554
height: 100%;
5655
overflow-y: auto;
56+
scrollbar-gutter: stable both-edges;
57+
scrollbar-width: thin;
5758

5859
.str-chat__channel-list-empty {
5960
height: 100%;

src/components/MessageList/styling/MessageList.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
}
2020

2121
.str-chat__message-list {
22-
@include utils.scrollable-y;
22+
overflow-y: auto;
23+
scrollbar-gutter: stable both-edges;
24+
overscroll-behavior: contain;
2325
display: flex;
2426
justify-content: center;
2527
position: relative;

src/components/MessageList/styling/VirtualizedMessageList.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@use '../../../styling/utils';
22

33
.str-chat__virtual-list {
4+
overflow-y: auto;
5+
scrollbar-gutter: stable both-edges;
6+
47
background: var(--background-core-app);
58
color: var(--text-primary);
6-
@include utils.scrollable-y;
79
--str-chat__message-list-scroll-max-width: calc(
810
var(--str-chat__message-composer-max-width) +
911
var(--str-chat__message-composer-padding)

src/components/Thread/ThreadHeader.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,9 @@ export const ThreadHeader = (props: ThreadHeaderProps) => {
9999

100100
return (
101101
<div className='str-chat__thread-header'>
102-
{activeChatView === 'threads' && HeaderStartContent && (
103-
<div className='str-chat__thread-header__start'>
104-
<HeaderStartContent />
105-
</div>
106-
)}
102+
<div className='str-chat__thread-header__start'>
103+
{activeChatView === 'threads' && HeaderStartContent && <HeaderStartContent />}
104+
</div>
107105
<div className='str-chat__thread-header-details'>
108106
<div className='str-chat__thread-header-title'>{t('Thread')}</div>
109107
<ThreadHeaderSubtitle

src/components/Thread/styling/ThreadHeader.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
.str-chat__thread-header-details {
1919
@include utils.header-text-layout;
20-
align-items: start;
21-
flex: 1;
20+
min-width: 0;
21+
justify-self: center;
2222

2323
.str-chat__thread-header-subtitle,
2424
.str-chat__thread-header-title {
@@ -31,12 +31,13 @@
3131
}
3232

3333
.str-chat__thread-header__start {
34-
display: flex;
34+
min-width: 0;
35+
justify-self: start;
3536
}
3637

3738
.str-chat__thread-header__end {
38-
display: flex;
39-
justify-content: flex-end;
39+
min-width: 0;
40+
justify-self: end;
4041
}
4142

4243
.str-chat__close-thread-button {

src/styling/_utils.scss

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,19 @@
9999
}
100100

101101
@mixin header-layout {
102-
display: flex;
103-
align-items: center;
104102
width: 100%;
105103
padding: var(--spacing-md);
106-
gap: var(--spacing-sm);
107104
height: var(--str-chat__channel-header-height);
108-
min-width: 0;
105+
display: grid;
106+
grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
107+
align-items: center;
109108
}
110-
111109
@mixin header-text-layout {
112110
display: flex;
113111
flex-direction: column;
114112
align-items: center;
115113
overflow-y: hidden; // for Edge
116114
overflow-x: hidden; // for ellipsis text
117-
max-width: 100%;
118-
row-gap: var(--spacing-xxs);
119-
width: 100%;
120115
}
121116

122117
@mixin empty-theme($component-name) {

0 commit comments

Comments
 (0)