Skip to content

Commit 34fee6a

Browse files
committed
feat: reconcile pin-indicator with message-reminder grid areas in a message
1 parent ada736c commit 34fee6a

1 file changed

Lines changed: 28 additions & 29 deletions

File tree

src/components/Message/styling/Message.scss

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,15 @@
229229

230230
.str-chat__message-reminder {
231231
grid-area: message-reminder;
232-
padding-block: var(--str-chat__spacing-2) var(--str-chat__spacing-0_5);
232+
padding-block: var(--spacing-xxs);
233233
margin: 0;
234234
@include utils.component-layer-overrides('message-reminder');
235235
font: var(--str-chat__caption-medium-text);
236236
}
237237

238238
@mixin message-grid-no-avatar {
239239
grid-template-areas:
240+
'pin-indicator'
240241
'message-reminder'
241242
'message'
242243
'translation-notice'
@@ -245,6 +246,28 @@
245246
grid-template-columns: 1fr;
246247
}
247248

249+
@mixin message-grid-other-with-avatar {
250+
grid-template-areas:
251+
'. pin-indicator'
252+
'. message-reminder'
253+
'avatar message'
254+
'avatar translation-notice'
255+
'avatar custom-metadata'
256+
'avatar metadata';
257+
grid-template-columns: auto 1fr;
258+
}
259+
260+
@mixin message-grid-me-with-avatar {
261+
grid-template-areas:
262+
'pin-indicator .'
263+
'message-reminder .'
264+
'message avatar'
265+
'translation-notice avatar'
266+
'custom-metadata avatar'
267+
'metadata avatar';
268+
grid-template-columns: 1fr auto;
269+
}
270+
248271
.str-chat__message-pin-indicator {
249272
grid-area: pin-indicator;
250273
padding-block: var(--spacing-xxs);
@@ -267,13 +290,7 @@
267290
justify-items: flex-start;
268291

269292
&.str-chat__message--with-avatar {
270-
grid-template-areas:
271-
'. message-reminder'
272-
'avatar message'
273-
'avatar translation-notice'
274-
'avatar custom-metadata'
275-
'avatar metadata';
276-
grid-template-columns: auto 1fr;
293+
@include message-grid-other-with-avatar;
277294
}
278295

279296
&:not(.str-chat__message--with-avatar) {
@@ -300,37 +317,19 @@
300317
}
301318

302319
&.str-chat__message--pinned.str-chat__message--other {
303-
grid-template-areas:
304-
'. pin-indicator'
305-
'. message-reminder'
306-
'avatar message'
307-
'avatar translation-notice'
308-
'avatar custom-metadata'
309-
'avatar metadata';
320+
@include message-grid-other-with-avatar;
310321
}
311322

312323
&.str-chat__message--pinned.str-chat__message--me {
313-
grid-template-areas:
314-
'pin-indicator .'
315-
'message-reminder .'
316-
'message avatar'
317-
'translation-notice avatar'
318-
'custom-metadata avatar'
319-
'metadata avatar';
324+
@include message-grid-me-with-avatar;
320325
}
321326

322327
&.str-chat__message--me {
323328
column-gap: var(--str-chat__spacing-2);
324329
justify-items: flex-end;
325330

326331
&.str-chat__message--with-avatar {
327-
grid-template-areas:
328-
'message-reminder .'
329-
'message avatar'
330-
'translation-notice avatar'
331-
'custom-metadata avatar'
332-
'metadata avatar';
333-
grid-template-columns: 1fr auto;
332+
@include message-grid-me-with-avatar;
334333
}
335334

336335
&:not(.str-chat__message--with-avatar) {

0 commit comments

Comments
 (0)