Merge branch 'master' into fix-5557

carbon-design-system · Mar 20, 2020 · ac44e74 · ac44e74
2 parents 2b219b5 + 478a4a8
commit ac44e74
Show file tree

Hide file tree

Showing 21 changed files with 187 additions and 173 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -13,5 +13,5 @@
 
 # Release team should be notified of Public API changes in the following
 # packages
-/packages/react/__tests__/PublicAPI-test.js @carbon-design-system/developers-system @carbon-design-system/release
-/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap @carbon-design-system/developers-system @carbon-design-system/release
+/packages/react/__tests__/PublicAPI-test.js @carbon-design-system/release @carbon-design-system/developers-system
+/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap @carbon-design-system/release @carbon-design-system/developers-system
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -11930,6 +11930,7 @@ $expressive-heading-05: (
   breakpoints: (
     md: (
       font-size: carbon--type-scale(9),
+      font-weight: carbon--font-weight('light'),
       line-height: 122%,
     ),
     lg: (
@@ -11942,6 +11943,7 @@ $expressive-heading-05: (
     ),
     max: (
       font-size: carbon--type-scale(13),
+      line-height: carbon--rem(70px),
     ),
   ),
 );
@@ -11978,6 +11980,7 @@ $expressive-heading-06: (
     ),
     max: (
       font-size: carbon--type-scale(13),
+      line-height: carbon--rem(70px),
     ),
   ),
 );

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -65,9 +65,6 @@
     "babel-core": "7.0.0-bridge.0",
     "freshy": ">= 1.0.3"
   },
-  "peerDependencies": {
-    "@carbon/icons": "^10.9.0"
-  },
   "dependencies": {
     "flatpickr": "4.6.1",
     "lodash.debounce": "^4.0.8",

diff --git a/packages/elements/docs/sass.md b/packages/elements/docs/sass.md
@@ -11223,6 +11223,7 @@ $expressive-heading-05: (
   breakpoints: (
     md: (
       font-size: carbon--type-scale(9),
+      font-weight: carbon--font-weight('light'),
       line-height: 122%,
     ),
     lg: (
@@ -11235,6 +11236,7 @@ $expressive-heading-05: (
     ),
     max: (
       font-size: carbon--type-scale(13),
+      line-height: carbon--rem(70px),
     ),
   ),
 );
@@ -11271,6 +11273,7 @@ $expressive-heading-06: (
     ),
     max: (
       font-size: carbon--type-scale(13),
+      line-height: carbon--rem(70px),
     ),
   ),
 );