From b69a460c8821a033c451b380fdd6dd38204606bc Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 11:44:57 -0500 Subject: [PATCH 1/7] docs(LocaleModal): use JSX boolean attribute notation --- .../components/LocaleModal/__stories__/LocaleModal.stories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/components/LocaleModal/__stories__/LocaleModal.stories.js b/packages/react/src/components/LocaleModal/__stories__/LocaleModal.stories.js index b9bae0272a6..a32571079e3 100644 --- a/packages/react/src/components/LocaleModal/__stories__/LocaleModal.stories.js +++ b/packages/react/src/components/LocaleModal/__stories__/LocaleModal.stories.js @@ -28,7 +28,7 @@ export const Default = ({ parameters }) => { const { useMockData } = parameters?.props?.LocaleModal ?? {}; return ( From 85a189c7e0ed323a69ebd7f2887cb1685afdb276 Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 11:54:03 -0500 Subject: [PATCH 2/7] fix(locale-modal): wrap token name with quotes --- packages/styles/scss/components/locale-modal/_locale-modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styles/scss/components/locale-modal/_locale-modal.scss b/packages/styles/scss/components/locale-modal/_locale-modal.scss index 47e0453ea9f..6548b41ec64 100644 --- a/packages/styles/scss/components/locale-modal/_locale-modal.scss +++ b/packages/styles/scss/components/locale-modal/_locale-modal.scss @@ -120,7 +120,7 @@ } .#{$prefix}--modal-header__heading { - @include carbon--type-style(expressive-heading-04, true); + @include carbon--type-style('expressive-heading-04', true); margin-top: $carbon--spacing-04; From 3d35ea12358458efba5279b458e378b1f28c9288 Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 11:54:40 -0500 Subject: [PATCH 3/7] fix(locale-modal): use `body-short-02` for eyebrow --- packages/styles/scss/components/locale-modal/_locale-modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styles/scss/components/locale-modal/_locale-modal.scss b/packages/styles/scss/components/locale-modal/_locale-modal.scss index 6548b41ec64..b5b7a0c5094 100644 --- a/packages/styles/scss/components/locale-modal/_locale-modal.scss +++ b/packages/styles/scss/components/locale-modal/_locale-modal.scss @@ -116,7 +116,7 @@ margin-right: $carbon--spacing-03; } - @include carbon--type-style('caption-01'); + @include carbon--type-style('body-short-02'); } .#{$prefix}--modal-header__heading { From 72facbf0bfe632158899b13de53690ba98ff32b6 Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 11:56:43 -0500 Subject: [PATCH 4/7] fix(locale-modal): update icon size --- .../styles/scss/components/locale-modal/_locale-modal.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/styles/scss/components/locale-modal/_locale-modal.scss b/packages/styles/scss/components/locale-modal/_locale-modal.scss index b5b7a0c5094..58998a91778 100644 --- a/packages/styles/scss/components/locale-modal/_locale-modal.scss +++ b/packages/styles/scss/components/locale-modal/_locale-modal.scss @@ -110,8 +110,11 @@ align-items: center; .#{$prefix}--locale-modal__label-globe { + width: rem(20px); + height: rem(20px); margin-left: $spacing-02; } + .#{$prefix}--locale-modal__label-arrow { margin-right: $carbon--spacing-03; } From bff15170add82f1b796b5f2838e63f3a6cbed484 Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 15:43:49 -0500 Subject: [PATCH 5/7] fix(locale-modal): update search text top padding --- packages/styles/scss/components/locale-modal/_locale-modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styles/scss/components/locale-modal/_locale-modal.scss b/packages/styles/scss/components/locale-modal/_locale-modal.scss index 58998a91778..ed67fe60ca8 100644 --- a/packages/styles/scss/components/locale-modal/_locale-modal.scss +++ b/packages/styles/scss/components/locale-modal/_locale-modal.scss @@ -257,7 +257,7 @@ } .#{$prefix}--locale-modal__search-text { - padding: $carbon--spacing-05; + padding: $carbon--spacing-07 $carbon--spacing-05 $carbon--spacing-05; min-height: $carbon--spacing-09; @include carbon--type-style(heading-02); From fdd2f1dc7b3c5befdcd8c120706ff9231ea834d2 Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 15:47:05 -0500 Subject: [PATCH 6/7] fix(locale-modal): use `label-02` for search text --- packages/styles/scss/components/locale-modal/_locale-modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styles/scss/components/locale-modal/_locale-modal.scss b/packages/styles/scss/components/locale-modal/_locale-modal.scss index ed67fe60ca8..a4064c3fa7e 100644 --- a/packages/styles/scss/components/locale-modal/_locale-modal.scss +++ b/packages/styles/scss/components/locale-modal/_locale-modal.scss @@ -260,7 +260,7 @@ padding: $carbon--spacing-07 $carbon--spacing-05 $carbon--spacing-05; min-height: $carbon--spacing-09; - @include carbon--type-style(heading-02); + @include carbon--type-style('label-02'); } .#{$prefix}--locale-modal__list { From 257aaba012cebefb5cd4075a5c60c37cca65ddee Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 7 Sep 2021 15:49:41 -0500 Subject: [PATCH 7/7] fix(locale-modal): set search divider rule color token --- packages/styles/scss/components/locale-modal/_locale-modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styles/scss/components/locale-modal/_locale-modal.scss b/packages/styles/scss/components/locale-modal/_locale-modal.scss index a4064c3fa7e..a534d5e0ae3 100644 --- a/packages/styles/scss/components/locale-modal/_locale-modal.scss +++ b/packages/styles/scss/components/locale-modal/_locale-modal.scss @@ -249,7 +249,7 @@ position: sticky; top: 0; background-color: $ui-background; - border-bottom: 1px solid $icon-02; + border-bottom: rem(1px) solid $ui-03; .#{$prefix}--search-input { background-color: $field-01;