Merge branch 'master' into 6915-search-component-disabled-prop

carbon-design-system · Oct 2, 2020 · 033c992 · 033c992
2 parents 8d3381f + bfe5ac2
commit 033c992
Show file tree

Hide file tree

Showing 35 changed files with 2,091 additions and 491 deletions.
diff --git a/config/stylelint-config-carbon/package.json b/config/stylelint-config-carbon/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stylelint-config-carbon",
   "description": "Stylelint configuration for Carbon",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": "https://github.com/carbon-design-system/carbon/tree/master/config/stylelint-config-carbon",

diff --git a/package.json b/package.json
@@ -109,7 +109,8 @@
           "perf",
           "refactor",
           "revert",
-          "test"
+          "test",
+          "style"
         ]
       ]
     }

diff --git a/packages/colors/package.json b/packages/colors/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/colors",
   "description": "Colors for digital and software products using the Carbon Design System",
-  "version": "10.13.0",
+  "version": "10.14.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,8 @@ @@
               "perf",
               "refactor",
               "revert",
-              "test"
+              "test",
+              "style"
             ]
           ]
         }
@@ Expand Down @@