Merge branch 'master' into fix-text-area-update-type-invalidText

carbon-design-system · Dec 11, 2020 · afacd61 · afacd61
2 parents 378c202 + 23adf93
commit afacd61
Show file tree

Hide file tree

Showing 18 changed files with 11,065 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,4 +49,7 @@ node_modules
 package-lock.json
 
 # AAT test results from DAP/Axe
-results/
+results/
+
+# Directories generated by Next.js
+.next
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -436,6 +436,8 @@ Array [
   "PopulationDiagram",
   "Power",
   "PragueCharlesBridgeTower",
+  "PragueDancingHouse_01",
+  "PragueDancingHouse_02",
   "Pregnant",
   "Prescription",
   "Presentation",
@@ -477,6 +479,7 @@ Array [
   "RichTextFormat",
   "Robot",
   "Robotics",
+  "RockOn",
   "Rome",
   "SaasEnablement",
   "SampleFile",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -435,6 +435,8 @@ Array [
   "PopulationDiagram",
   "Power",
   "PragueCharlesBridgeTower",
+  "PragueDancingHouse_01",
+  "PragueDancingHouse_02",
   "Pregnant",
   "Prescription",
   "Presentation",
@@ -476,6 +478,7 @@ Array [
   "RichTextFormat",
   "Robot",
   "Robotics",
+  "RockOn",
   "Rome",
   "SaasEnablement",
   "SampleFile",

diff --git a/packages/colors/README.md b/packages/colors/README.md
@@ -143,6 +143,13 @@ If you're looking for `@carbon/colors` API documentation, check out:
 
 - [Sass](./docs/sass.md)
 
+## 📚 Examples
+
+If you're looking for more examples on how to use `@carbon/colors`, we have some
+examples that you can check out:
+
+- [sass-modules](./examples/sass-modules)
+
 ## 🙌 Contributing
 
 We're always looking for contributors to help us fix bugs, build new features,