Skip to content

Commit 63a7e39

Browse files
committed
update(theme): invitation components
1 parent 06a01f8 commit 63a7e39

4 files changed

Lines changed: 106 additions & 114 deletions

File tree

client/src/components/invitations/AsyncEnrollmentRequestItem.vue

Lines changed: 64 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
v-if="isSmallDisplay"
1717
>
1818
<div class="request-mobile-header">
19-
<ion-text class="request-mobile-header__name subtitles-normal">
19+
<ion-text class="request-mobile-header__name">
2020
<span v-if="request.identitySystem.tag === AsyncEnrollmentIdentitySystemTag.PKICorrupted">
2121
{{ $msTranslate('InvitationsPage.asyncEnrollmentRequest.errors.unknownName') }}
2222
</span>
2323
<span v-else>{{ humanHandle.label }}</span>
2424
</ion-text>
25-
<ion-text class="request-mobile-header__email button-medium">
25+
<ion-text class="request-mobile-header__email">
2626
{{ humanHandle.email }}
2727
</ion-text>
2828
</div>
2929
<div class="request-mobile-content">
30-
<ion-text class="request-mobile-content__createdOn body-sm">
30+
<ion-text class="request-mobile-content__createdOn">
3131
{{ $msTranslate(formatTimeSince(request.submittedOn, '--', 'short')) }}
3232
</ion-text>
33-
<div class="button-small request-type">
33+
<div class="request-type">
3434
<ion-text
3535
class="request-type__label"
3636
v-if="request.identitySystem.tag === AsyncEnrollmentIdentitySystemTag.OpenBao"
@@ -94,7 +94,7 @@
9494

9595
<!-- request type -->
9696
<div
97-
class="list-item-column request-type button-medium"
97+
class="list-item-column request-type"
9898
v-if="isLargeDisplay"
9999
>
100100
<ion-text
@@ -124,15 +124,15 @@
124124
<ion-button
125125
v-show="canAccept"
126126
@click="$emit('acceptClick', request)"
127-
class="primary-button button-medium button-default"
127+
class="primary-button button-default"
128128
size="default"
129129
>
130130
{{ $msTranslate('InvitationsPage.asyncEnrollmentRequest.accept') }}
131131
</ion-button>
132132
</div>
133133

134134
<ion-text
135-
class="request-actions-secondary__text button-medium"
135+
class="request-actions-secondary__text"
136136
:class="{ 'request-actions-secondary__text--active': showErrorDetails }"
137137
v-if="!canAccept"
138138
@click="toggleErrorDetails"
@@ -151,7 +151,7 @@
151151
<ion-button
152152
v-if="request.identitySystem.tag === AsyncEnrollmentIdentitySystemTag.PKICorrupted"
153153
@click="$emit('rejectClick', request)"
154-
class="primary-button button-medium button-default"
154+
class="primary-button button-default"
155155
size="default"
156156
>
157157
{{ $msTranslate('InvitationsPage.asyncEnrollmentRequest.reject') }}
@@ -272,30 +272,38 @@ onMounted(async () => {
272272
}
273273
274274
.request-name {
275-
color: var(--parsec-color-light-secondary-text);
275+
color: ms.color('text-base-body');
276276
}
277277
278278
.request-email,
279279
.request-createdOn {
280-
color: var(--parsec-color-light-secondary-hard-grey);
280+
color: ms.color('text-base-description');
281281
}
282282
283283
.request-type {
284284
display: flex;
285285
align-items: center;
286286
287287
&__label {
288-
background: var(--parsec-color-light-secondary-premiere);
289-
border: 1px solid var(--parsec-color-light-secondary-medium);
290-
color: var(--parsec-color-light-secondary-text);
291-
border-radius: var(--parsec-radius-12);
292-
padding: 3px 0.5rem;
288+
background: ms.color('surface-base-page-secondary');
289+
border: ms.border('thin') solid ms.color('border-base-default');
290+
color: ms.color('text-base-body');
291+
border-radius: ms.radius('2xl');
292+
padding: 3px ms.spacing('padding-lg');
293293
width: fit-content;
294294
flex-shrink: 0;
295295
margin: 0;
296296
}
297297
}
298298
299+
.request-mobile-content .request-type {
300+
@include ms.font('label-sm-medium');
301+
}
302+
303+
.list-item-column.request-type {
304+
@include ms.font('label-md-medium');
305+
}
306+
299307
.request-actions {
300308
position: sticky;
301309
z-index: 10;
@@ -308,56 +316,62 @@ onMounted(async () => {
308316
display: flex;
309317
flex-direction: row-reverse;
310318
justify-content: space-between;
311-
gap: 0.5rem;
319+
gap: ms.spacing('gap-lg');
312320
width: 100%;
313-
background: var(--parsec-color-light-secondary-background);
314-
padding: 0.5rem 0.75rem;
321+
background: ms.color('surface-base-default-secondary');
322+
padding: ms.spacing('padding-lg') ms.spacing('padding-2xl');
323+
}
324+
325+
.primary-button {
326+
@include ms.font('label-md-medium');
315327
}
316328
317329
&-secondary__text {
330+
@include ms.font('label-md-medium');
318331
display: flex;
319332
cursor: pointer;
320-
gap: 0.25rem;
321-
color: var(--parsec-color-light-danger-500);
333+
gap: ms.spacing('gap-sm');
334+
color: ms.color('text-error-default');
322335
align-self: center;
323-
padding: 0.5rem 0.5rem;
324-
border-radius: var(--parsec-radius-8);
336+
padding: ms.spacing('padding-lg') ms.spacing('padding-lg');
337+
border-radius: ms.radius('lg');
325338
326339
&:hover {
327-
background: var(--parsec-color-light-danger-50);
340+
background: ms.color('surface-error-default-subtle-hover');
328341
}
329342
330343
&--active {
331-
background: var(--parsec-color-light-danger-50);
332-
border: 1px solid var(--parsec-color-light-danger-100);
344+
background: ms.color('surface-error-default-subtle-hover');
345+
border: ms.border('thin') solid ms.color('border-error-default-subtle-hover');
333346
}
334347
}
335348
}
336349
337350
.request-mobile {
338351
display: flex;
339352
flex-direction: column;
340-
gap: 0.5rem;
341353
width: 100%;
342-
gap: 1rem;
343-
padding: 1rem 0.75rem;
354+
gap: ms.spacing('gap-3xl');
355+
padding: ms.spacing('padding-3xl') ms.spacing('padding-2xl');
344356
345357
&-header {
346358
display: flex;
347359
flex-direction: column;
348360
justify-content: space-between;
349361
overflow: hidden;
350-
gap: 0.25rem;
362+
gap: ms.spacing('gap-sm');
351363
352364
&__name {
353-
color: var(--parsec-color-light-secondary-text);
365+
@include ms.font('label-lg-medium');
366+
color: ms.color('text-base-body');
354367
text-overflow: ellipsis;
355368
overflow: hidden;
356369
white-space: nowrap;
357370
}
358371
359372
&__email {
360-
color: var(--parsec-color-light-secondary-grey);
373+
@include ms.font('label-md-medium');
374+
color: ms.color('text-base-description');
361375
text-overflow: ellipsis;
362376
overflow: hidden;
363377
white-space: nowrap;
@@ -370,7 +384,8 @@ onMounted(async () => {
370384
align-items: center;
371385
372386
&__createdOn {
373-
color: var(--parsec-color-light-secondary-grey);
387+
@include ms.font('body-sm-regular');
388+
color: ms.color('text-base-description');
374389
}
375390
}
376391
}
@@ -383,25 +398,25 @@ onMounted(async () => {
383398
}
384399
385400
.request-list-item--corrupted {
386-
--background: var(--parsec-color-light-danger-50);
387-
--background-hover: var(--parsec-color-light-danger-50);
401+
--background: #{ms.color('surface-error-default-subtle-hover')};
402+
--background-hover: #{ms.color('surface-error-default-subtle-hover')};
388403
389404
.label-email {
390405
display: flex;
391406
}
392407
393408
.request-type__label {
394409
background: transparent;
395-
border: 1px solid var(--parsec-color-light-danger-100);
396-
color: var(--parsec-color-light-danger-500);
410+
border: ms.border('thin') solid ms.color('border-error-default-subtle-hover');
411+
color: ms.color('text-error-default');
397412
}
398413
399414
.request-actions .primary-button {
400-
color: var(--parsec-color-light-secondary-white);
415+
color: ms.color('text-on-color-label');
401416
402417
&::part(native) {
403-
background: var(--parsec-color-light-danger-500);
404-
--background-hover: var(--parsec-color-light-danger-700);
418+
background: ms.color('surface-error-default');
419+
--background-hover: #{ms.color('surface-error-default-hover')};
405420
}
406421
}
407422
}
@@ -410,11 +425,11 @@ onMounted(async () => {
410425
display: flex;
411426
align-items: center;
412427
width: 100%;
413-
gap: 0.5rem;
414-
padding: 0 0.75rem;
428+
gap: ms.spacing('gap-lg');
429+
padding: ms.spacing('padding-none') ms.spacing('padding-2xl');
415430
margin: 0 0.25rem;
416-
border-radius: var(--parsec-radius-12);
417-
background: var(--parsec-color-light-danger-50);
431+
border-radius: ms.radius('2xl');
432+
background: ms.color('surface-error-default-subtle-hover');
418433
max-height: 0;
419434
overflow: hidden;
420435
opacity: 0;
@@ -426,25 +441,25 @@ onMounted(async () => {
426441
427442
&--visible {
428443
max-height: 10rem;
429-
opacity: 1;
430-
padding: 0.5rem 0.75rem;
444+
opacity: ms.opacity('10');
445+
padding: ms.spacing('padding-lg') ms.spacing('padding-2xl');
431446
margin: 1rem 0.25rem 0.25rem;
432447
}
433448
434449
@include ms.responsive-breakpoint('sm') {
435450
flex-direction: column;
436451
align-items: start;
437-
border-radius: 0;
452+
border-radius: ms.radius('none');
438453
margin: 0;
439454
}
440455
441456
.request-error__title {
442-
color: var(--parsec-color-light-secondary-text);
443-
padding-top: 0.25rem;
457+
color: ms.color('text-base-body');
458+
padding-top: ms.spacing('padding-sm');
444459
}
445460
446461
.request-error__details {
447-
color: var(--parsec-color-light-secondary-text);
462+
color: ms.color('text-base-body');
448463
}
449464
}
450465
</style>

0 commit comments

Comments
 (0)