From 26c07e1dfaa75dcf17ad0b4db9fd8445d3cdf2f8 Mon Sep 17 00:00:00 2001 From: Lee Chase Date: Tue, 8 Sep 2020 22:11:36 +0100 Subject: [PATCH 1/5] fix: correct stylelint config documentation (#6790) Co-authored-by: Lee Chase --- config/stylelint-config-carbon/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/stylelint-config-carbon/README.md b/config/stylelint-config-carbon/README.md index f3bd63b9bad4..4ea84a628054 100644 --- a/config/stylelint-config-carbon/README.md +++ b/config/stylelint-config-carbon/README.md @@ -25,7 +25,7 @@ You can use `stylelint-config-carbon` in your project by extending it in your ```json { - "extends": ["carbon"] + "extends": ["stylelint-config-carbon"] } ``` From 60844252c9795fa7a30078d8d5102a123022a405 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Wed, 9 Sep 2020 16:12:50 +0100 Subject: [PATCH 2/5] Update _code-snippet.scss (#6782) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../components/src/components/code-snippet/_code-snippet.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/components/code-snippet/_code-snippet.scss b/packages/components/src/components/code-snippet/_code-snippet.scss index 97239af4b365..b5b2e6f8a28c 100644 --- a/packages/components/src/components/code-snippet/_code-snippet.scss +++ b/packages/components/src/components/code-snippet/_code-snippet.scss @@ -183,7 +183,7 @@ .#{$prefix}--snippet--multi .#{$prefix}--snippet-container pre { padding-right: $carbon--spacing-08; padding-bottom: rem(24px); - overflow-x: scroll; + overflow-x: auto; } .#{$prefix}--snippet--multi.#{$prefix}--snippet--no-copy From ee7cfc106f11f9b08d02749ee52e1884e45404c1 Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Wed, 9 Sep 2020 15:33:44 +0000 Subject: [PATCH 3/5] chore(project): sync generated files --- packages/components/docs/sass.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index a1b73a259492..8d3577c23a40 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -14710,7 +14710,7 @@ Code snippet styles .#{$prefix}--snippet--multi .#{$prefix}--snippet-container pre { padding-right: $carbon--spacing-08; padding-bottom: rem(24px); - overflow-x: scroll; + overflow-x: auto; } .#{$prefix}--snippet--multi.#{$prefix}--snippet--no-copy From 4904ac685271df25b7b8a10d67777da84121a097 Mon Sep 17 00:00:00 2001 From: Panpan Lin Date: Wed, 9 Sep 2020 18:02:39 +0100 Subject: [PATCH 4/5] remove redundant proptypes value for locale (#6784) * remove redundant proptypes value for locale There are two `en` there. I suppose one of them is redundant. * chore(snapshot): update snapshots Co-authored-by: TJ Egan --- packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap | 1 - packages/react/src/components/DatePicker/DatePicker.js | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap index b12d909ace50..f1633c417ce3 100644 --- a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap +++ b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap @@ -2006,7 +2006,6 @@ Map { "da", "de", "en", - "en", "eo", "es", "et", diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js index 908b524f9f6d..2b916f38e4cd 100644 --- a/packages/react/src/components/DatePicker/DatePicker.js +++ b/packages/react/src/components/DatePicker/DatePicker.js @@ -215,7 +215,6 @@ export default class DatePicker extends Component { 'da', 'de', 'en', - 'en', 'eo', 'es', 'et', From 260708f6b55e7613f41a0320b6f5415a29700c0d Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 9 Sep 2020 20:21:18 +0300 Subject: [PATCH 5/5] fix Tag component (#6785) * fix Tag component * + fix diff height between Tag and Tag with filter; Co-authored-by: Anton Ryazanov Co-authored-by: TJ Egan Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/components/src/components/tag/_tag.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components/src/components/tag/_tag.scss b/packages/components/src/components/tag/_tag.scss index a54c238324d1..74fe08bb0704 100644 --- a/packages/components/src/components/tag/_tag.scss +++ b/packages/components/src/components/tag/_tag.scss @@ -158,10 +158,10 @@ .#{$prefix}--tag__close-icon { flex-shrink: 0; - width: rem(20px); - height: rem(20px); + width: rem(16px); + height: rem(16px); margin: 0 0 0 rem(4px); - padding: rem(2px); + padding: 0; color: currentColor; background-color: transparent; border: 0;