Skip to content

Commit 445225a

Browse files
committed
fix(ui): upgrades background colors and spacing in message component
1 parent b14375b commit 445225a

3 files changed

Lines changed: 42 additions & 37 deletions

File tree

packages/ui-components/src/components/Message/Message.component.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,29 @@ const messageBaseStyles = `
1414
jn:rounded
1515
jn:leading-5
1616
jn:overflow-hidden
17-
jn:items-center
17+
jn:items-top
18+
`
19+
const messageIconStyles = `
20+
jn:mt-2
21+
jn:mb-2 // In case without message title, to keep height consistent
1822
`
1923

2024
const messageHeadingStyles = `
2125
jn:font-bold
2226
`
2327

2428
const messageContentStyles = `
25-
jn:py-3
29+
jn:pt-2
30+
jn:pb-2.5
2631
jn:pr-4
27-
jn:ml-7
32+
jn:ml-2.5
2833
`
2934

3035
const messageBorderStyles = `
3136
jn:w-[4px]
3237
jn:self-stretch
3338
jn:border-l-4
34-
jn:mr-6
39+
jn:mr-2.5
3540
jn:shrink-0
3641
`
3742

@@ -40,7 +45,7 @@ const dismissButtonStyles = `
4045
jn:self-stretch
4146
jn:flex
4247
jn:flex-col
43-
jn:py-2.5
48+
jn:py-2
4449
jn:pr-2.5
4550
`
4651

@@ -257,7 +262,7 @@ export const Message = ({
257262
{...props}
258263
>
259264
<div className={`juno-message-border ${messageBorderStyles} ${variantStyle}`}></div>
260-
<Icon icon={iconToRender} className={`${getIconStyles(variant)}`} />
265+
<Icon icon={iconToRender} size={21} className={`${getIconStyles(variant)} ${messageIconStyles}`} />
261266
<div className={`juno-message-content ${messageContentStyles}`}>
262267
{title && <h1 className={messageHeadingStyles}>{title}</h1>}
263268
<div>{children || text}</div>

packages/ui-components/src/global.css

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@
385385
--background-color-theme-topnavigation-item: var(--color-topnavigation-item-bg);
386386
--background-color-theme-topnavigation-item-active: var(--color-topnavigation-item-active-bg);
387387

388-
/* Component Background Images: */
389-
--background-image-theme-message-default: var(--gradient-message-default-bg);
390-
--background-image-theme-message-success: var(--gradient-message-success-bg);
391-
--background-image-theme-message-warning: var(--gradient-message-warning-bg);
392-
--background-image-theme-message-danger: var(--gradient-message-danger-bg);
393-
--background-image-theme-message-error: var(--gradient-message-error-bg);
388+
/* Component Background Colors: */
389+
--background-color-theme-message-default: var(--color-message-default-bg);
390+
--background-color-theme-message-success: var(--color-message-success-bg);
391+
--background-color-theme-message-warning: var(--color-message-warning-bg);
392+
--background-color-theme-message-danger: var(--color-message-danger-bg);
393+
--background-color-theme-message-error: var(--color-message-error-bg);
394394

395395
/* Component Text Colors: */
396396
--text-color-theme-highest: var(--color-text-highest);
@@ -612,15 +612,15 @@
612612

613613
/* LT Message */
614614
--color-message-danger-border: var(--color-danger);
615-
--gradient-message-danger-bg: linear-gradient(90deg, rgb(255, 231, 224) 0%, rgb(255, 180, 158) 100%);
615+
--color-message-danger-bg: rgb(249, 229, 229);
616616
--color-message-default-border: var(--color-info);
617-
--gradient-message-default-bg: linear-gradient(90deg, rgb(229, 244, 248) 0%, rgb(46, 168, 196) 100%);
617+
--color-message-default-bg: rgb(229, 241, 250);
618618
--color-message-error-border: var(--color-error);
619-
--gradient-message-error-bg: linear-gradient(90deg, rgb(255, 231, 224) 0%, rgb(255, 180, 158) 100%);
619+
--color-message-error-bg: rgb(249, 229, 229);
620620
--color-message-warning-border: var(--color-warning);
621-
--gradient-message-warning-bg: linear-gradient(90deg, rgb(253, 245, 226) 0%, rgb(255, 231, 147) 100%);
621+
--color-message-warning-bg: rgb(255, 247, 229);
622622
--color-message-success-border: var(--color-success);
623-
--gradient-message-success-bg: linear-gradient(90deg, rgb(230, 247, 233) 0%, rgb(170, 229, 180) 100%);
623+
--color-message-success-bg: rgb(237, 248, 232);
624624

625625
/* LT Introbox */
626626
--color-introbox-bg: var(--color-background-lvl-2);
@@ -862,15 +862,15 @@
862862

863863
/* DT Message */
864864
--color-message-danger-border: var(--color-danger);
865-
--gradient-message-danger-bg: linear-gradient(90deg, rgb(57, 39, 38) 0%, rgb(124, 48, 30) 100%);
865+
--color-message-danger-bg: rgb(49, 27, 26);
866866
--color-message-default-border: var(--color-info);
867-
--gradient-message-default-bg: linear-gradient(90deg, rgb(28, 57, 65) 0%, rgb(25, 108, 119) 100%);
867+
--color-message-default-bg: rgb(14, 48, 57);
868868
--color-message-error-border: var(--color-error);
869-
--gradient-message-error-bg: linear-gradient(90deg, rgb(57, 39, 38) 0%, rgb(124, 48, 30) 100%);
869+
--color-message-error-bg: rgb(49, 27, 26);
870870
--color-message-warning-border: var(--color-warning);
871-
--gradient-message-warning-bg: linear-gradient(90deg, rgb(57, 56, 36) 0%, rgb(124, 104, 24) 100%);
871+
--color-message-warning-bg: rgb(49, 47, 24);
872872
--color-message-success-border: var(--color-success);
873-
--gradient-message-success-bg: linear-gradient(90deg, rgb(32, 55, 46) 0%, rgb(39, 102, 57) 100%);
873+
--color-message-success-bg: rgb(20, 48, 34);
874874
/* DT Introbox */
875875
--color-introbox-bg: var(--color-background-lvl-2);
876876
--color-introbox-border: var(--color-accent);

packages/ui-components/src/theme.css

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,11 @@
376376
--background-color-theme-topnavigation-item-active: var(--color-topnavigation-item-active-bg);
377377

378378
/* Component Background Images: */
379-
--background-image-theme-message-default: var(--gradient-message-default-bg);
380-
--background-image-theme-message-success: var(--gradient-message-success-bg);
381-
--background-image-theme-message-warning: var(--gradient-message-warning-bg);
382-
--background-image-theme-message-danger: var(--gradient-message-danger-bg);
383-
--background-image-theme-message-error: var(--gradient-message-error-bg);
379+
--background-color-theme-message-default: var(--color-message-default-bg);
380+
--background-color-theme-message-success: var(--color-message-success-bg);
381+
--background-color-theme-message-warning: var(--color-message-warning-bg);
382+
--background-color-theme-message-danger: var(--color-message-danger-bg);
383+
--background-color-theme-message-error: var(--color-message-error-bg);
384384

385385
/* Component Text Colors: */
386386
--text-color-theme-highest: var(--color-text-highest);
@@ -603,15 +603,15 @@
603603

604604
/* LT Message */
605605
--color-message-danger-border: var(--color-danger);
606-
--gradient-message-danger-bg: linear-gradient(90deg, rgb(255, 231, 224) 0%, rgb(255, 180, 158) 100%);
606+
--color-message-danger-bg: rgb(249, 229, 229);
607607
--color-message-default-border: var(--color-info);
608-
--gradient-message-default-bg: linear-gradient(90deg, rgb(229, 244, 248) 0%, rgb(46, 168, 196) 100%);
608+
--color-message-default-bg: rgb(229, 241, 250);
609609
--color-message-error-border: var(--color-error);
610-
--gradient-message-error-bg: linear-gradient(90deg, rgb(255, 231, 224) 0%, rgb(255, 180, 158) 100%);
610+
--color-message-error-bg: rgb(249, 229, 229);
611611
--color-message-warning-border: var(--color-warning);
612-
--gradient-message-warning-bg: linear-gradient(90deg, rgb(253, 245, 226) 0%, rgb(255, 231, 147) 100%);
612+
--color-message-warning-bg: rgb(255, 247, 229);
613613
--color-message-success-border: var(--color-success);
614-
--gradient-message-success-bg: linear-gradient(90deg, rgb(230, 247, 233) 0%, rgb(170, 229, 180) 100%);
614+
--color-message-success-bg: rgb(237, 248, 232);
615615

616616
/* LT Introbox */
617617
--color-introbox-bg: var(--color-background-lvl-2);
@@ -853,15 +853,15 @@
853853

854854
/* DT Message */
855855
--color-message-danger-border: var(--color-danger);
856-
--gradient-message-danger-bg: linear-gradient(90deg, rgb(57, 39, 38) 0%, rgb(124, 48, 30) 100%);
856+
--color-message-danger-bg: rgb(49, 27, 26);
857857
--color-message-default-border: var(--color-info);
858-
--gradient-message-default-bg: linear-gradient(90deg, rgb(28, 57, 65) 0%, rgb(25, 108, 119) 100%);
858+
--color-message-default-bg: rgb(14, 48, 57);
859859
--color-message-error-border: var(--color-error);
860-
--gradient-message-error-bg: linear-gradient(90deg, rgb(57, 39, 38) 0%, rgb(124, 48, 30) 100%);
860+
--color-message-error-bg: rgb(49, 27, 26);
861861
--color-message-warning-border: var(--color-warning);
862-
--gradient-message-warning-bg: linear-gradient(90deg, rgb(57, 56, 36) 0%, rgb(124, 104, 24) 100%);
862+
--color-message-warning-bg: rgb(49, 47, 24);
863863
--color-message-success-border: var(--color-success);
864-
--gradient-message-success-bg: linear-gradient(90deg, rgb(32, 55, 46) 0%, rgb(39, 102, 57) 100%);
864+
--color-message-success-bg: rgba(20, 48, 34);
865865
/* DT Introbox */
866866
--color-introbox-bg: var(--color-background-lvl-2);
867867
--color-introbox-border: var(--color-accent);

0 commit comments

Comments
 (0)