Skip to content

Commit 7cf5cff

Browse files
committed
Merge branch 'main' into feat/search
# Conflicts: # src/v2/styles/_icons.scss
2 parents a524bcd + 56e8b51 commit 7cf5cff

File tree

11 files changed

+84
-10
lines changed

11 files changed

+84
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@stream-io/stream-chat-css",
3-
"version": "5.4.0",
3+
"version": "5.6.1",
44
"main": "dist/css/index.css",
55
"description": "Bundled CSS for Stream Chat web SDKs",
66
"repository": "[email protected]:GetStream/stream-chat-css.git",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.str-chat__ai-state-indicator-container {
2+
padding: 0 8px;
3+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.str-chat__ai-state-indicator-container {
2+
background-color: var(--str-chat__grey300);
3+
}
4+
5+
.str-chat__ai-state-indicator-text {
6+
color: var(--str-chat__text-color);
7+
}

src/v2/styles/ChannelPreview/ChannelPreview-layout.scss

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,28 @@
2525
}
2626
}
2727

28+
.str-chat__channel-preview-container {
29+
position: relative;
30+
31+
.str-chat__channel-preview__action-buttons {
32+
position: absolute;
33+
right: var(--str-chat__spacing-2);
34+
bottom: var(--str-chat__spacing-3);
35+
display: flex;
36+
flex-direction: row;
37+
align-items: center;
38+
gap: 1px;
39+
40+
.str-chat__channel-preview__action-button {
41+
42+
--str-chat-icon-height: 13px;
43+
cursor: pointer;
44+
padding-block: 2px;
45+
padding-inline: 4px;
46+
}
47+
}
48+
}
49+
2850
.str-chat__channel-preview {
2951
@include channel-preview-layout;
3052
cursor: pointer;
@@ -78,6 +100,8 @@
78100
p {
79101
@include utils.ellipsis-text;
80102
margin: 0;
103+
// 40px is the width of the two action buttons
104+
max-width: calc(100% - 40px);
81105
}
82106
}
83107
}

src/v2/styles/ChannelPreview/ChannelPreview-theme.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,24 @@
6464
--str-chat__channel-preview-message-time-color: var(--str-chat__message-secondary-color);
6565
}
6666

67+
.str-chat__channel-preview-container {
68+
.str-chat__channel-preview__action-buttons {
69+
.str-chat__channel-preview__action-button {
70+
--str-chat-icon-color: var(--str-chat__text-low-emphasis-color);
71+
border: none;
72+
background-color: transparent;
73+
}
74+
75+
.str-chat__channel-preview__action-button--pin.str-chat__channel-preview__action-button--active {
76+
--str-chat-icon-color: var(--str-chat__unread-badge-color);
77+
}
78+
79+
.str-chat__channel-preview__action-button--archive.str-chat__channel-preview__action-button--active {
80+
--str-chat-icon-color: var(--str-chat__text-color);
81+
}
82+
}
83+
}
84+
6785
.str-chat__channel-preview {
6886
@include utils.component-layer-overrides('channel-preview');
6987

src/v2/styles/Message/Message-layout.scss

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
var(--str-chat__quoted-message-inside-message-input-max-width) +
2424
calc(var(--str-chat__spacing-px) * 50)
2525
);
26+
27+
/* The maximum number of lines displayed for quoted messages, set to "none" to turn off clamping */
28+
--str-chat__quoted-message-line-clamp: 5;
2629
}
2730

2831
.str-chat__message {
@@ -59,12 +62,21 @@
5962
}
6063
}
6164

65+
.str-chat__quoted-message-text-value {
66+
overflow: hidden;
67+
display: -webkit-box;
68+
-webkit-line-clamp: var(--str-chat__quoted-message-line-clamp);
69+
line-clamp: var(--str-chat__quoted-message-line-clamp);
70+
-webkit-box-orient: vertical;
71+
}
72+
6273
.str-chat__message,
6374
.str-chat__quoted-message-preview {
6475
@mixin chat-bubble-spacing {
6576
padding: var(--str-chat__spacing-2) var(--str-chat__spacing-4);
6677

6778
p {
79+
white-space: pre-line;
6880
margin: 0;
6981
}
7082
}
@@ -165,10 +177,6 @@
165177
.str-chat__message-text-inner {
166178
@include utils.prevent-glitch-text-overflow;
167179
}
168-
169-
p {
170-
white-space: pre-line;
171-
}
172180
}
173181
}
174182
}
@@ -357,7 +365,6 @@
357365
}
358366
}
359367

360-
361368
.str-chat__message-inner {
362369
.str-chat__message-options {
363370
display: none;

src/v2/styles/MessageInput/MessageInput-layout.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@
129129
width: 100%;
130130
}
131131

132+
.str-chat__stop-ai-generation-button {
133+
width: calc(var(--str-chat__spacing-px) * 30);
134+
height: calc(var(--str-chat__spacing-px) * 28);
135+
cursor: pointer;
136+
}
137+
132138
.str-chat__send-button {
133139
--str-chat-icon-height: calc(var(--str-chat__spacing-px) * 32);
134140
@include utils.flex-row-center;
@@ -240,4 +246,4 @@
240246
.str-chat__attachment-selector-actions-menu {
241247
min-width: 300px;
242248
padding-block: 0.5rem;
243-
}
249+
}

src/v2/styles/MessageInput/MessageInput-theme.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@
168168

169169
/* Box shadow applied to the cooldown timer */
170170
--str-chat__cooldown-box-shadow: none;
171-
171+
172172
/* Color applied to an icon in a button that opens attachment selector */
173173
--str-chat__attachment-selector-button-icon-color: var(--str-chat__text-low-emphasis-color);
174-
174+
175175
/* Color applied to an icon in a button that opens attachment selector when hovered over */
176176
--str-chat__attachment-selector-button-icon-color-hover: var(--str-chat__primary-color);
177177

@@ -221,6 +221,12 @@
221221
}
222222
}
223223

224+
.str-chat__stop-ai-generation-button {
225+
background-image: var(--str-chat__circle-stop-icon);
226+
background-color: transparent;
227+
border-width: 0;
228+
}
229+
224230
.str-chat__send-button {
225231
--str-chat-icon-color: var(--str-chat__message-send-color);
226232
@include utils.component-layer-overrides('message-send');
@@ -342,4 +348,4 @@
342348
mask: var(--str-chat__poll-icon) no-repeat center / contain;
343349
}
344350
}
345-
}
351+
}

src/v2/styles/_icons.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
--str-chat__folder-icon: url('data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjAgMTYiIGZpbGw9ImN1cnJlbnRDb2xvciIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxwYXRoIGQ9Ik0xOCAySDEwTDggMEgyQzAuOSAwIDAuMDA5OTk5OTkgMC45IDAuMDA5OTk5OTkgMkwwIDE0QzAgMTUuMSAwLjkgMTYgMiAxNkgxOEMxOS4xIDE2IDIwIDE1LjEgMjAgMTRWNEMyMCAyLjkgMTkuMSAyIDE4IDJaTTE4IDE0SDJWNEgxOFYxNFoiIC8+Cjwvc3ZnPgo=');
1010
--str-chat__poll-icon: url('data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTggMTgiIGZpbGw9ImN1cnJlbnRDb2xvciIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxwYXRoIGQ9Ik0xNiAwSDJDMC45IDAgMCAwLjkgMCAyVjE2QzAgMTcuMSAwLjkgMTggMiAxOEgxNkMxNy4xIDE4IDE4IDE3LjEgMTggMTZWMkMxOCAwLjkgMTcuMSAwIDE2IDBaTTE2IDE2SDJWMkgxNlYxNlpNNCA3SDZWMTRINFY3Wk04IDRIMTBWMTRIOFY0Wk0xMiAxMEgxNFYxNEgxMlYxMFoiLz4KPC9zdmc+');
1111
--str-chat__handle-icon: url('data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTYgNiIgZmlsbD0iY3VycmVuQ29sb3IiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgICA8cGF0aCBkPSJNMTYgMEgwVjJIMTZWMFpNMCA2SDE2VjRIMFY2WiIvPgo8L3N2Zz4K');
12+
--str-chat__circle-stop-icon: url('data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjMyIiB2aWV3Qm94PSI0IDQgMjggMjgiIHdpZHRoPSIzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE2LjQ1NTEgMjcuMjQ0MUMyMi42MzA5IDI3LjI0NDEgMjcuNzQ0MSAyMi4xMTk4IDI3Ljc0NDEgMTUuOTU1MUMyNy43NDQxIDkuNzc5MyAyMi42MTk4IDQuNjY2MDIgMTYuNDQ0IDQuNjY2MDJDMTAuMjc5MyA0LjY2NjAyIDUuMTY2MDIgOS43NzkzIDUuMTY2MDIgMTUuOTU1MUM1LjE2NjAyIDIyLjExOTggMTAuMjkwNCAyNy4yNDQxIDE2LjQ1NTEgMjcuMjQ0MVpNMTYuNDU1MSAyNS4zNjI2QzExLjIzMTEgMjUuMzYyNiA3LjA1ODU5IDIxLjE3OSA3LjA1ODU5IDE1Ljk1NTFDNy4wNTg1OSAxMC43MzExIDExLjIyMDEgNi41NDc1MyAxNi40NDQgNi41NDc1M0MyMS42NjggNi41NDc1MyAyNS44NTE2IDEwLjczMTEgMjUuODYyNiAxNS45NTUxQzI1Ljg3MzcgMjEuMTc5IDIxLjY3OSAyNS4zNjI2IDE2LjQ1NTEgMjUuMzYyNlpNMTMuNTIyMSAxOS45ODM3SDE5LjM2NTlDMjAuMDYzMiAxOS45ODM3IDIwLjQ3MjcgMTkuNTc0MiAyMC40NzI3IDE4Ljg5OTFWMTMuMDExMUMyMC40NzI3IDEyLjMyNDkgMjAuMDYzMiAxMS45MjY0IDE5LjM2NTkgMTEuOTI2NEgxMy41MjIxQzEyLjgzNTkgMTEuOTI2NCAxMi40MTU0IDEyLjMyNDkgMTIuNDE1NCAxMy4wMTExVjE4Ljg5OTFDMTIuNDE1NCAxOS41NzQyIDEyLjgzNTkgMTkuOTgzNyAxMy41MjIxIDE5Ljk4MzdaIiBmaWxsPSIjMDA1ZmZmIi8+Cjwvc3ZnPg==');
1213
--str-chat__magnifier-glass-icon: url('data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjEgMjEiIGZpbGw9ImN1cnJlbnRDb2xvciIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNOSAwQzEzLjk2OCAwIDE4IDQuMDMyIDE4IDlDMTggMTMuOTY4IDEzLjk2OCAxOCA5IDE4QzQuMDMyIDE4IDAgMTMuOTY4IDAgOUMwIDQuMDMyIDQuMDMyIDAgOSAwWk05IDE2QzEyLjg2NyAxNiAxNiAxMi44NjcgMTYgOUMxNiA1LjEzMiAxMi44NjcgMiA5IDJDNS4xMzIgMiAyIDUuMTMyIDIgOUMyIDEyLjg2NyA1LjEzMiAxNiA5IDE2Wk0yMC4zMTQgMTguODk5TDE3LjQ4NSAxNi4wNzFMMTYuMDcxIDE3LjQ4NUwxOC44OTkgMjAuMzE0TDIwLjMxNCAxOC44OTlaIi8+Cjwvc3ZnPgo=');
1314
--str-chat__clear-icon: url('data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjAgMjAiIGZpbGw9ImN1cnJlbnRDb2xvciIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wIDEwQzAgNC40NzcxNSA0LjQ3NzE1IDAgMTAgMEMxNS41MjI4IDAgMjAgNC40NzcxNSAyMCAxMEMyMCAxNS41MjI4IDE1LjUyMjggMjAgMTAgMjBDNC40NzcxNSAyMCAwIDE1LjUyMjggMCAxMFpNMTAgMkM1LjU4MTcyIDIgMiA1LjU4MTcyIDIgMTBDMiAxNC40MTgzIDUuNTgxNzIgMTggMTAgMThDMTQuNDE4MyAxOCAxOCAxNC40MTgzIDE4IDEwQzE4IDUuNTgxNzIgMTQuNDE4MyAyIDEwIDJaTTEzLjUzNTggNi40NjQ0NkMxMy4xNDUzIDYuMDczOTQgMTIuNTEyMSA2LjA3Mzk0IDEyLjEyMTYgNi40NjQ0NkwxMC4wMDAzIDguNTg1NzhMNy44Nzg5OCA2LjQ2NDQ2QzcuNDg4NDYgNi4wNzM5NCA2Ljg1NTI5IDYuMDczOTQgNi40NjQ3NyA2LjQ2NDQ2QzYuMDc0MjQgNi44NTQ5OSA2LjA3NDI0IDcuNDg4MTUgNi40NjQ3NyA3Ljg3ODY4TDguNTg2MDkgMTBMNi40NjQ3NyAxMi4xMjEzQzYuMDc0MjQgMTIuNTExOCA2LjA3NDI0IDEzLjE0NSA2LjQ2NDc3IDEzLjUzNTVDNi44NTUyOSAxMy45MjYxIDcuNDg4NDYgMTMuOTI2MSA3Ljg3ODk4IDEzLjUzNTVMMTAuMDAwMyAxMS40MTQyTDEyLjEyMTYgMTMuNTM1NUMxMi41MTIxIDEzLjkyNjEgMTMuMTQ1MyAxMy45MjYxIDEzLjUzNTggMTMuNTM1NUMxMy45MjY0IDEzLjE0NSAxMy45MjY0IDEyLjUxMTggMTMuNTM1OCAxMi4xMjEzTDExLjQxNDUgMTBMMTMuNTM1OCA3Ljg3ODY4QzEzLjkyNjQgNy40ODgxNSAxMy45MjY0IDYuODU0OTkgMTMuNTM1OCA2LjQ2NDQ2WiIvPgo8L3N2Zz4K');
1415
}

src/v2/styles/index.layout.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@
4444
@use 'ThreadList/ThreadList-layout';
4545
@use 'ChatView/ChatView-layout';
4646
@use 'UnreadCountBadge/UnreadCountBadge-layout';
47+
@use 'AIStateIndicator/AIStateIndicator-layout';

0 commit comments

Comments
 (0)