Merge branch 'master' into 6788-treenode-sync-expanded-props-state

carbon-design-system · Sep 9, 2020 · 38be518 · 38be518
2 parents 9d99b08 + 260708f
commit 38be518
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git 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"]
 }
 ```
 

diff --git 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

diff --git 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

diff --git 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;

diff --git 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
@@ -215,7 +215,6 @@ export default class DatePicker extends Component {
       'da',
       'de',
       'en',
-      'en',
       'eo',
       'es',
       'et',
-Original file line number
+Diff line change
@@ Expand Up @@
     ```json
     {
-      "extends": ["carbon"]
+      "extends": ["stylelint-config-carbon"]
     }
     ```
@@ Expand Down @@