@carbon/type 10.10.1-rc.0 → 10.11.0

package/es/index.js

@@ -143,6 +143,8 @@ function getTypeSize(step) {
 var scale = [12, 14, 16, 18, 20, 24, 28, 32, 36, 42, 48, 54, 60, 68, 76, 84, 92, 102, 112, 122, 132, 144, 156];
 
 function _typeof(obj) {
+  "@babel/helpers - typeof";
+
   if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
     _typeof = function (obj) {
       return typeof obj;
@@ -313,7 +315,7 @@ var productiveHeading02 = heading02;
 var productiveHeading03 = {
   fontSize: rem(scale[4]),
   fontWeight: fontWeights.regular,
-  lineHeight: rem(26),
+  lineHeight: rem(28),
   letterSpacing: 0
 };
 var productiveHeading04 = {
@@ -340,16 +342,16 @@ var productiveHeading07 = {
   lineHeight: rem(64),
   letterSpacing: 0
 };
-var expressiveHeading01 = _objectSpread2({}, heading01, {
+var expressiveHeading01 = _objectSpread2(_objectSpread2({}, heading01), {}, {
   lineHeight: rem(20)
 });
-var expressiveHeading02 = _objectSpread2({}, heading02, {
+var expressiveHeading02 = _objectSpread2(_objectSpread2({}, heading02), {}, {
   lineHeight: rem(24)
 });
 var expressiveHeading03 = {
   fontSize: rem(scale[4]),
   fontWeight: fontWeights.regular,
-  lineHeight: '130%',
+  lineHeight: '140%',
   letterSpacing: 0,
   breakpoints: {
     xlg: {
@@ -662,7 +664,7 @@ function fluid(selector) {
 
   styles.fontSize = fluidTypeSize(styles, 'sm', fluidBreakpoints);
   fluidBreakpointNames.forEach(function (name) {
-    styles[breakpoint(name)] = _objectSpread2({}, fluidBreakpoints[name], {
+    styles[breakpoint(name)] = _objectSpread2(_objectSpread2({}, fluidBreakpoints[name]), {}, {
       fontSize: fluidTypeSize(styles, name, fluidBreakpoints)
     });
   });

package/lib/index.js

@@ -147,6 +147,8 @@ function getTypeSize(step) {
 var scale = [12, 14, 16, 18, 20, 24, 28, 32, 36, 42, 48, 54, 60, 68, 76, 84, 92, 102, 112, 122, 132, 144, 156];
 
 function _typeof(obj) {
+  "@babel/helpers - typeof";
+
   if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
     _typeof = function (obj) {
       return typeof obj;
@@ -317,7 +319,7 @@ var productiveHeading02 = heading02;
 var productiveHeading03 = {
   fontSize: layout.rem(scale[4]),
   fontWeight: fontWeights.regular,
-  lineHeight: layout.rem(26),
+  lineHeight: layout.rem(28),
   letterSpacing: 0
 };
 var productiveHeading04 = {
@@ -344,16 +346,16 @@ var productiveHeading07 = {
   lineHeight: layout.rem(64),
   letterSpacing: 0
 };
-var expressiveHeading01 = _objectSpread2({}, heading01, {
+var expressiveHeading01 = _objectSpread2(_objectSpread2({}, heading01), {}, {
   lineHeight: layout.rem(20)
 });
-var expressiveHeading02 = _objectSpread2({}, heading02, {
+var expressiveHeading02 = _objectSpread2(_objectSpread2({}, heading02), {}, {
   lineHeight: layout.rem(24)
 });
 var expressiveHeading03 = {
   fontSize: layout.rem(scale[4]),
   fontWeight: fontWeights.regular,
-  lineHeight: '130%',
+  lineHeight: '140%',
   letterSpacing: 0,
   breakpoints: {
     xlg: {
@@ -666,7 +668,7 @@ function fluid(selector) {
 
   styles.fontSize = fluidTypeSize(styles, 'sm', fluidBreakpoints);
   fluidBreakpointNames.forEach(function (name) {
-    styles[layout.breakpoint(name)] = _objectSpread2({}, fluidBreakpoints[name], {
+    styles[layout.breakpoint(name)] = _objectSpread2(_objectSpread2({}, fluidBreakpoints[name]), {}, {
       fontSize: fluidTypeSize(styles, name, fluidBreakpoints)
     });
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/type",
   "description": "Typography for digital and software products using the Carbon Design System",
-  "version": "10.10.1-rc.0",
+  "version": "10.11.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -33,11 +33,11 @@
   },
   "dependencies": {
     "@carbon/import-once": "^10.3.0",
-    "@carbon/layout": "^10.9.1-rc.0"
+    "@carbon/layout": "^10.10.0"
   },
   "devDependencies": {
-    "@carbon/bundler": "^10.7.0",
-    "@carbon/test-utils": "^10.8.1-rc.0",
+    "@carbon/bundler": "^10.8.0",
+    "@carbon/test-utils": "^10.9.0",
     "change-case": "^4.1.1",
     "rimraf": "^3.0.0"
   },
@@ -47,5 +47,5 @@
     "sassDir": "scss",
     "needs": "^1.3.0"
   },
-  "gitHead": "9a2c88577f44437841a3a7f5c8256ac88dfc815d"
+  "gitHead": "2863dbcf312ed9942e2e5d8f094b9e280c2f2e8c"
 }

package/scss/_inlined/_styles.scss

@@ -44,7 +44,7 @@ $helper-text-01: (
 $body-short-01: (
   font-size: carbon--type-scale(2),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(18px),
+  line-height: carbon--em(18px),
   letter-spacing: 0.16px,
 ) !default;
 
@@ -54,7 +54,7 @@ $body-short-01: (
 $body-long-01: (
   font-size: carbon--type-scale(2),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(20px),
+  line-height: carbon--em(20px),
   letter-spacing: 0.16px,
 ) !default;
 
@@ -64,7 +64,7 @@ $body-long-01: (
 $body-short-02: (
   font-size: carbon--type-scale(3),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(22px),
+  line-height: carbon--em(22px),
   letter-spacing: 0,
 ) !default;
 
@@ -74,7 +74,7 @@ $body-short-02: (
 $body-long-02: (
   font-size: carbon--type-scale(3),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(24px),
+  line-height: carbon--em(24px),
   letter-spacing: 0,
 ) !default;
 
@@ -136,7 +136,7 @@ $productive-heading-02: $heading-02 !default;
 $productive-heading-03: (
   font-size: carbon--type-scale(5),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(26px),
+  line-height: carbon--rem(28px),
   letter-spacing: 0,
 ) !default;
 
@@ -206,7 +206,7 @@ $expressive-heading-02: map-merge(
 $expressive-heading-03: (
   font-size: carbon--type-scale(5),
   font-weight: carbon--font-weight('regular'),
-  line-height: 130%,
+  line-height: 140%,
   letter-spacing: 0,
   breakpoints: (
     xlg: (

package/scss/_styles.scss

@@ -44,7 +44,7 @@ $helper-text-01: (
 $body-short-01: (
   font-size: carbon--type-scale(2),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(18px),
+  line-height: carbon--em(18px),
   letter-spacing: 0.16px,
 ) !default;
 
@@ -54,7 +54,7 @@ $body-short-01: (
 $body-long-01: (
   font-size: carbon--type-scale(2),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(20px),
+  line-height: carbon--em(20px),
   letter-spacing: 0.16px,
 ) !default;
 
@@ -64,7 +64,7 @@ $body-long-01: (
 $body-short-02: (
   font-size: carbon--type-scale(3),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(22px),
+  line-height: carbon--em(22px),
   letter-spacing: 0,
 ) !default;
 
@@ -74,7 +74,7 @@ $body-short-02: (
 $body-long-02: (
   font-size: carbon--type-scale(3),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(24px),
+  line-height: carbon--em(24px),
   letter-spacing: 0,
 ) !default;
 
@@ -136,7 +136,7 @@ $productive-heading-02: $heading-02 !default;
 $productive-heading-03: (
   font-size: carbon--type-scale(5),
   font-weight: carbon--font-weight('regular'),
-  line-height: carbon--rem(26px),
+  line-height: carbon--rem(28px),
   letter-spacing: 0,
 ) !default;
 
@@ -206,7 +206,7 @@ $expressive-heading-02: map-merge(
 $expressive-heading-03: (
   font-size: carbon--type-scale(5),
   font-weight: carbon--font-weight('regular'),
-  line-height: 130%,
+  line-height: 140%,
   letter-spacing: 0,
   breakpoints: (
     xlg: (

package/src/__tests__/__snapshots__/styles-test.js.snap

@@ -96,7 +96,7 @@ letter-spacing: 0;"
 exports[`styles expressiveHeading03 should be printable 1`] = `
 "font-size: 1.25rem;
 font-weight: 400;
-line-height: 130%;
+line-height: 140%;
 letter-spacing: 0;"
 `;
 
@@ -174,7 +174,7 @@ letter-spacing: 0;"
 exports[`styles productiveHeading03 should be printable 1`] = `
 "font-size: 1.25rem;
 font-weight: 400;
-line-height: 1.625rem;
+line-height: 1.75rem;
 letter-spacing: 0;"
 `;
 

package/src/styles.js

@@ -95,7 +95,7 @@ export const productiveHeading02 = heading02;
 export const productiveHeading03 = {
   fontSize: rem(scale[4]),
   fontWeight: fontWeights.regular,
-  lineHeight: rem(26),
+  lineHeight: rem(28),
   letterSpacing: 0,
 };
 
@@ -140,7 +140,7 @@ export const expressiveHeading02 = {
 export const expressiveHeading03 = {
   fontSize: rem(scale[4]),
   fontWeight: fontWeights.regular,
-  lineHeight: '130%',
+  lineHeight: '140%',
   letterSpacing: 0,
   breakpoints: {
     xlg: {

package/umd/index.js

@@ -147,6 +147,8 @@
   var scale = [12, 14, 16, 18, 20, 24, 28, 32, 36, 42, 48, 54, 60, 68, 76, 84, 92, 102, 112, 122, 132, 144, 156];
 
   function _typeof(obj) {
+    "@babel/helpers - typeof";
+
     if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
       _typeof = function (obj) {
         return typeof obj;
@@ -317,7 +319,7 @@
   var productiveHeading03 = {
     fontSize: layout.rem(scale[4]),
     fontWeight: fontWeights.regular,
-    lineHeight: layout.rem(26),
+    lineHeight: layout.rem(28),
     letterSpacing: 0
   };
   var productiveHeading04 = {
@@ -344,16 +346,16 @@
     lineHeight: layout.rem(64),
     letterSpacing: 0
   };
-  var expressiveHeading01 = _objectSpread2({}, heading01, {
+  var expressiveHeading01 = _objectSpread2(_objectSpread2({}, heading01), {}, {
     lineHeight: layout.rem(20)
   });
-  var expressiveHeading02 = _objectSpread2({}, heading02, {
+  var expressiveHeading02 = _objectSpread2(_objectSpread2({}, heading02), {}, {
     lineHeight: layout.rem(24)
   });
   var expressiveHeading03 = {
     fontSize: layout.rem(scale[4]),
     fontWeight: fontWeights.regular,
-    lineHeight: '130%',
+    lineHeight: '140%',
     letterSpacing: 0,
     breakpoints: {
       xlg: {
@@ -666,7 +668,7 @@
 
     styles.fontSize = fluidTypeSize(styles, 'sm', fluidBreakpoints);
     fluidBreakpointNames.forEach(function (name) {
-      styles[layout.breakpoint(name)] = _objectSpread2({}, fluidBreakpoints[name], {
+      styles[layout.breakpoint(name)] = _objectSpread2(_objectSpread2({}, fluidBreakpoints[name]), {}, {
         fontSize: fluidTypeSize(styles, name, fluidBreakpoints)
       });
     });