From 44f877a01b6ee6ecf751a1927c84560afa4c1d50 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Thu, 18 Aug 2022 17:58:01 -0500
Subject: [PATCH 01/11] fix(type): update v10 token styles

---
 packages/type/src/styles.js | 53 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/packages/type/src/styles.js b/packages/type/src/styles.js
index 218a2fe28bee..063f4943e584 100644
--- a/packages/type/src/styles.js
+++ b/packages/type/src/styles.js
@@ -131,7 +131,7 @@ export const productiveHeading03 = {
 
 export const productiveHeading04 = {
   fontSize: rem(scale[6]),
-  fontWeight: fontWeights.regular,
+  fontWeight: fontWeights.light,
   lineHeight: 1.28572,
   letterSpacing: 0,
 };
@@ -193,40 +193,38 @@ export const expressiveHeading04 = {
     xlg: {
       fontSize: rem(scale[6]),
       lineHeight: 1.25,
+      fontWeight: fontWeights.light,
     },
     max: {
       fontSize: rem(scale[7]),
+      fontWeight: fontWeights.light,
     },
   },
 };
 
 export const expressiveHeading05 = {
   fontSize: rem(scale[7]),
-  fontWeight: fontWeights.regular,
+  fontWeight: fontWeights.light,
   lineHeight: 1.25,
   letterSpacing: 0,
   breakpoints: {
     md: {
       fontSize: rem(scale[8]),
-      fontWeight: fontWeights.light,
       lineHeight: 1.22,
       letterSpacing: 0,
     },
     lg: {
       fontSize: rem(scale[9]),
-      fontWeight: fontWeights.light,
       lineHeight: 1.19,
       letterSpacing: 0,
     },
     xlg: {
       fontSize: rem(scale[10]),
-      fontWeight: fontWeights.light,
       lineHeight: 1.17,
       letterSpacing: 0,
     },
     max: {
       fontSize: rem(scale[12]),
-      fontWeight: fontWeights.light,
       letterSpacing: 0,
     },
   },
@@ -386,55 +384,54 @@ export const display02 = {
 };
 
 export const display03 = {
-  fontSize: rem(scale[9]),
+  fontSize: rem(scale[42]),
   fontWeight: fontWeights.light,
-  lineHeight: 1.19,
+  lineHeight: 3.125,
   letterSpacing: 0,
   breakpoints: {
     md: {
-      fontSize: rem(scale[13]),
-      lineHeight: 1.15,
+      fontSize: rem(scale[54]),
+      lineHeight: 4,
     },
     lg: {
-      fontSize: rem(scale[16]),
-      lineHeight: 1.11,
+      fontSize: rem(scale[60]),
+      lineHeight: 4.375,
       letterSpacing: px(-0.64),
     },
     xlg: {
-      fontSize: rem(scale[19]),
-      lineHeight: 1.07,
+      fontSize: rem(scale[76]),
+      lineHeight: 5.375,
     },
     max: {
-      fontSize: rem(scale[22]),
-      lineHeight: 1.05,
+      fontSize: rem(scale[84]),
+      lineHeight: 5.875,
       letterSpacing: px(-0.96),
     },
   },
 };
 
 export const display04 = {
-  fontSize: rem(scale[9]),
-  fontWeight: fontWeights.semibold,
-  lineHeight: 1.19,
+  fontSize: rem(scale[42]),
+  fontWeight: fontWeights.light,
+  lineHeight: 3.125,
   letterSpacing: 0,
   breakpoints: {
     md: {
-      fontSize: rem(scale[13]),
-      lineHeight: 1.15,
+      fontSize: rem(scale[68]),
+      lineHeight: 4.875,
     },
     lg: {
-      fontSize: rem(scale[16]),
-      lineHeight: 1.11,
+      fontSize: rem(scale[92]),
+      lineHeight: 6.375,
       letterSpacing: px(-0.64),
     },
     xlg: {
-      fontSize: rem(scale[19]),
-      lineHeight: 1.07,
-      letterSpacing: px(-0.64),
+      fontSize: rem(scale[122]),
+      lineHeight: 8.125,
     },
     max: {
-      fontSize: rem(scale[22]),
-      lineHeight: 1.05,
+      fontSize: rem(scale[156]),
+      lineHeight: 10.25,
       letterSpacing: px(-0.96),
     },
   },

From ea05f9b2b6573e4af7a69639199c65528f2095c6 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 14:21:00 -0500
Subject: [PATCH 02/11] fix: productive heading 05 weight

---
 packages/type/src/styles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/type/src/styles.js b/packages/type/src/styles.js
index 063f4943e584..508d8aadf5a5 100644
--- a/packages/type/src/styles.js
+++ b/packages/type/src/styles.js
@@ -131,14 +131,14 @@ export const productiveHeading03 = {
 
 export const productiveHeading04 = {
   fontSize: rem(scale[6]),
-  fontWeight: fontWeights.light,
+  fontWeight: fontWeights.regular,
   lineHeight: 1.28572,
   letterSpacing: 0,
 };
 
 export const productiveHeading05 = {
   fontSize: rem(scale[7]),
-  fontWeight: fontWeights.regular,
+  fontWeight: fontWeights.light,
   lineHeight: 1.25,
   letterSpacing: 0,
 };

From 2780f24a7cb4722d737509a8869a2d0542301fb3 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 14:44:30 -0500
Subject: [PATCH 03/11] fix: js scale and line height

---
 packages/type/scss/_styles.scss | 44 ++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/type/scss/_styles.scss b/packages/type/scss/_styles.scss
index 08c3ca957825..a65071fc3d3e 100644
--- a/packages/type/scss/_styles.scss
+++ b/packages/type/scss/_styles.scss
@@ -276,7 +276,7 @@ $heading-04: $productive-heading-04 !default;
 /// @group @carbon/type
 $productive-heading-05: (
   font-size: carbon--type-scale(8),
-  font-weight: carbon--font-weight('regular'),
+  font-weight: carbon--font-weight('light'),
   line-height: 1.25,
   letter-spacing: 0,
 ) !default;
@@ -364,9 +364,11 @@ $expressive-heading-04: (
     xlg: (
       font-size: carbon--type-scale(7),
       line-height: 1.25,
+      font-weight: carbon--font-weight('light'),
     ),
     max: (
       font-size: carbon--type-scale(8),
+      font-weight: carbon--font-weight('light'),
     ),
   ),
 ) !default;
@@ -381,13 +383,12 @@ $fluid-heading-04: $expressive-heading-04 !default;
 /// @group @carbon/type
 $expressive-heading-05: (
   font-size: carbon--type-scale(8),
-  font-weight: carbon--font-weight('regular'),
+  font-weight: carbon--font-weight('light'),
   line-height: 1.25,
   letter-spacing: 0,
   breakpoints: (
     md: (
       font-size: carbon--type-scale(9),
-      font-weight: carbon--font-weight('light'),
       line-height: 1.22,
     ),
     lg: (
@@ -598,28 +599,28 @@ $fluid-display-02: $display-02 !default;
 /// @access public
 /// @group @carbon/type
 $display-03: (
-  font-size: carbon--type-scale(10),
+  font-size: carbon--type-scale(11),
   font-weight: carbon--font-weight('light'),
   line-height: 1.19,
   letter-spacing: 0,
   breakpoints: (
     md: (
-      font-size: carbon--type-scale(14),
-      line-height: 1.15,
+      font-size: carbon--type-scale(13),
+      line-height: 1.18,
     ),
     lg: (
-      font-size: carbon--type-scale(17),
-      line-height: 1.11,
+      font-size: carbon--type-scale(14),
+      line-height: 1.16,
       letter-spacing: -0.64px,
     ),
     xlg: (
-      font-size: carbon--type-scale(20),
-      line-height: 1.07,
+      font-size: carbon--type-scale(16),
+      line-height: 1.13,
       letter-spacing: -0.64px,
     ),
     max: (
-      font-size: carbon--type-scale(23),
-      line-height: 1.05,
+      font-size: carbon--type-scale(17),
+      line-height: 1.11,
       letter-spacing: -0.96px,
     ),
   ),
@@ -634,27 +635,26 @@ $fluid-display-03: $display-03 !default;
 /// @access public
 /// @group @carbon/type
 $display-04: (
-  font-size: carbon--type-scale(10),
-  font-weight: carbon--font-weight('semibold'),
+  font-size: carbon--type-scale(11),
+  font-weight: carbon--font-weight('light'),
   line-height: 1.19,
   letter-spacing: 0,
   breakpoints: (
     md: (
-      font-size: carbon--type-scale(14),
-      line-height: 1.15,
+      font-size: carbon--type-scale(15),
+      line-height: 1.14,
     ),
     lg: (
-      font-size: carbon--type-scale(17),
-      line-height: 1.11,
+      font-size: carbon--type-scale(18),
+      line-height: 1.1,
       letter-spacing: -0.64px,
     ),
     xlg: (
-      font-size: carbon--type-scale(20),
-      line-height: 1.07,
-      letter-spacing: -0.64px,
+      font-size: carbon--type-scale(21),
+      line-height: 1.06,
     ),
     max: (
-      font-size: carbon--type-scale(23),
+      font-size: carbon--type-scale(24),
       line-height: 1.05,
       letter-spacing: -0.96px,
     ),

From 7e0052d7d0d1c7cd0429aca5120cc789558428d5 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 14:45:01 -0500
Subject: [PATCH 04/11] fix: make changes in styles

---
 packages/type/src/styles.js | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/type/src/styles.js b/packages/type/src/styles.js
index 508d8aadf5a5..788a4817e987 100644
--- a/packages/type/src/styles.js
+++ b/packages/type/src/styles.js
@@ -384,54 +384,54 @@ export const display02 = {
 };
 
 export const display03 = {
-  fontSize: rem(scale[42]),
+  fontSize: rem(scale[10]),
   fontWeight: fontWeights.light,
-  lineHeight: 3.125,
+  lineHeight: 1.19,
   letterSpacing: 0,
   breakpoints: {
     md: {
-      fontSize: rem(scale[54]),
-      lineHeight: 4,
+      fontSize: rem(scale[12]),
+      lineHeight: 1.18,
     },
     lg: {
-      fontSize: rem(scale[60]),
-      lineHeight: 4.375,
+      fontSize: rem(scale[13]),
+      lineHeight: 1.16,
       letterSpacing: px(-0.64),
     },
     xlg: {
-      fontSize: rem(scale[76]),
-      lineHeight: 5.375,
+      fontSize: rem(scale[15]),
+      lineHeight: 1.13,
     },
     max: {
-      fontSize: rem(scale[84]),
-      lineHeight: 5.875,
+      fontSize: rem(scale[16]),
+      lineHeight: 1.11,
       letterSpacing: px(-0.96),
     },
   },
 };
 
 export const display04 = {
-  fontSize: rem(scale[42]),
+  fontSize: rem(scale[10]),
   fontWeight: fontWeights.light,
-  lineHeight: 3.125,
+  lineHeight: 1.19,
   letterSpacing: 0,
   breakpoints: {
     md: {
-      fontSize: rem(scale[68]),
-      lineHeight: 4.875,
+      fontSize: rem(scale[14]),
+      lineHeight: 1.14,
     },
     lg: {
-      fontSize: rem(scale[92]),
-      lineHeight: 6.375,
+      fontSize: rem(scale[17]),
+      lineHeight: 1.1,
       letterSpacing: px(-0.64),
     },
     xlg: {
-      fontSize: rem(scale[122]),
-      lineHeight: 8.125,
+      fontSize: rem(scale[20]),
+      lineHeight: 1.06,
     },
     max: {
-      fontSize: rem(scale[156]),
-      lineHeight: 10.25,
+      fontSize: rem(scale[23]),
+      lineHeight: 1.05,
       letterSpacing: px(-0.96),
     },
   },

From 52ed25122210e5c489fa48c329eacc53d6ddf164 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 15:06:52 -0500
Subject: [PATCH 05/11] chore: update type snapshot

---
 .../__snapshots__/styles-test.js.snap         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/type/src/__tests__/__snapshots__/styles-test.js.snap b/packages/type/src/__tests__/__snapshots__/styles-test.js.snap
index 73bc1ab05e3b..eb1299e39f75 100644
--- a/packages/type/src/__tests__/__snapshots__/styles-test.js.snap
+++ b/packages/type/src/__tests__/__snapshots__/styles-test.js.snap
@@ -101,15 +101,15 @@ letter-spacing: 0;"
 `;
 
 exports[`styles display03 should be printable 1`] = `
-"font-size: 2.625rem;
+"font-size: 3rem;
 font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
 `;
 
 exports[`styles display04 should be printable 1`] = `
-"font-size: 2.625rem;
-font-weight: 600;
+"font-size: 3rem;
+font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
 `;
@@ -144,7 +144,7 @@ letter-spacing: 0;"
 
 exports[`styles expressiveHeading05 should be printable 1`] = `
 "font-size: 2rem;
-font-weight: 400;
+font-weight: 300;
 line-height: 1.25;
 letter-spacing: 0;"
 `;
@@ -178,15 +178,15 @@ letter-spacing: 0;"
 `;
 
 exports[`styles fluidDisplay03 should be printable 1`] = `
-"font-size: 2.625rem;
+"font-size: 3rem;
 font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
 `;
 
 exports[`styles fluidDisplay04 should be printable 1`] = `
-"font-size: 2.625rem;
-font-weight: 600;
+"font-size: 3rem;
+font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
 `;
@@ -207,7 +207,7 @@ letter-spacing: 0;"
 
 exports[`styles fluidHeading05 should be printable 1`] = `
 "font-size: 2rem;
-font-weight: 400;
+font-weight: 300;
 line-height: 1.25;
 letter-spacing: 0;"
 `;
@@ -272,7 +272,7 @@ letter-spacing: 0;"
 
 exports[`styles heading05 should be printable 1`] = `
 "font-size: 2rem;
-font-weight: 400;
+font-weight: 300;
 line-height: 1.25;
 letter-spacing: 0;"
 `;
@@ -375,7 +375,7 @@ letter-spacing: 0;"
 
 exports[`styles productiveHeading05 should be printable 1`] = `
 "font-size: 2rem;
-font-weight: 400;
+font-weight: 300;
 line-height: 1.25;
 letter-spacing: 0;"
 `;

From 4e320822df98ab42d2fc6484c6494a9d56281e04 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 16:55:05 -0500
Subject: [PATCH 06/11] fix: font size scale in js and scss

---
 packages/type/scss/_styles.scss | 20 ++++++++++----------
 packages/type/src/styles.js     | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/type/scss/_styles.scss b/packages/type/scss/_styles.scss
index a65071fc3d3e..d38b9b87e535 100644
--- a/packages/type/scss/_styles.scss
+++ b/packages/type/scss/_styles.scss
@@ -599,27 +599,27 @@ $fluid-display-02: $display-02 !default;
 /// @access public
 /// @group @carbon/type
 $display-03: (
-  font-size: carbon--type-scale(11),
+  font-size: carbon--type-scale(10),
   font-weight: carbon--font-weight('light'),
   line-height: 1.19,
   letter-spacing: 0,
   breakpoints: (
     md: (
-      font-size: carbon--type-scale(13),
+      font-size: carbon--type-scale(12),
       line-height: 1.18,
     ),
     lg: (
-      font-size: carbon--type-scale(14),
+      font-size: carbon--type-scale(13),
       line-height: 1.16,
       letter-spacing: -0.64px,
     ),
     xlg: (
-      font-size: carbon--type-scale(16),
+      font-size: carbon--type-scale(15),
       line-height: 1.13,
       letter-spacing: -0.64px,
     ),
     max: (
-      font-size: carbon--type-scale(17),
+      font-size: carbon--type-scale(16),
       line-height: 1.11,
       letter-spacing: -0.96px,
     ),
@@ -635,26 +635,26 @@ $fluid-display-03: $display-03 !default;
 /// @access public
 /// @group @carbon/type
 $display-04: (
-  font-size: carbon--type-scale(11),
+  font-size: carbon--type-scale(10),
   font-weight: carbon--font-weight('light'),
   line-height: 1.19,
   letter-spacing: 0,
   breakpoints: (
     md: (
-      font-size: carbon--type-scale(15),
+      font-size: carbon--type-scale(14),
       line-height: 1.14,
     ),
     lg: (
-      font-size: carbon--type-scale(18),
+      font-size: carbon--type-scale(17),
       line-height: 1.1,
       letter-spacing: -0.64px,
     ),
     xlg: (
-      font-size: carbon--type-scale(21),
+      font-size: carbon--type-scale(20),
       line-height: 1.06,
     ),
     max: (
-      font-size: carbon--type-scale(24),
+      font-size: carbon--type-scale(23),
       line-height: 1.05,
       letter-spacing: -0.96px,
     ),
diff --git a/packages/type/src/styles.js b/packages/type/src/styles.js
index 788a4817e987..c7d08979a0df 100644
--- a/packages/type/src/styles.js
+++ b/packages/type/src/styles.js
@@ -384,26 +384,26 @@ export const display02 = {
 };
 
 export const display03 = {
-  fontSize: rem(scale[10]),
+  fontSize: rem(scale[9]),
   fontWeight: fontWeights.light,
   lineHeight: 1.19,
   letterSpacing: 0,
   breakpoints: {
     md: {
-      fontSize: rem(scale[12]),
+      fontSize: rem(scale[11]),
       lineHeight: 1.18,
     },
     lg: {
-      fontSize: rem(scale[13]),
+      fontSize: rem(scale[12]),
       lineHeight: 1.16,
       letterSpacing: px(-0.64),
     },
     xlg: {
-      fontSize: rem(scale[15]),
+      fontSize: rem(scale[14]),
       lineHeight: 1.13,
     },
     max: {
-      fontSize: rem(scale[16]),
+      fontSize: rem(scale[15]),
       lineHeight: 1.11,
       letterSpacing: px(-0.96),
     },
@@ -411,26 +411,26 @@ export const display03 = {
 };
 
 export const display04 = {
-  fontSize: rem(scale[10]),
+  fontSize: rem(scale[9]),
   fontWeight: fontWeights.light,
   lineHeight: 1.19,
   letterSpacing: 0,
   breakpoints: {
     md: {
-      fontSize: rem(scale[14]),
+      fontSize: rem(scale[13]),
       lineHeight: 1.14,
     },
     lg: {
-      fontSize: rem(scale[17]),
+      fontSize: rem(scale[16]),
       lineHeight: 1.1,
       letterSpacing: px(-0.64),
     },
     xlg: {
-      fontSize: rem(scale[20]),
+      fontSize: rem(scale[19]),
       lineHeight: 1.06,
     },
     max: {
-      fontSize: rem(scale[23]),
+      fontSize: rem(scale[22]),
       lineHeight: 1.05,
       letterSpacing: px(-0.96),
     },

From 816df6983a22964b3d70cce47ebc523fc181f983 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 16:55:26 -0500
Subject: [PATCH 07/11] feat: add comments for js and scss scale

---
 packages/type/scss/_scale.scss | 25 ++++++++++++++++++
 packages/type/src/scale.js     | 48 ++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/packages/type/scss/_scale.scss b/packages/type/scss/_scale.scss
index 6074bd6c178a..e6affa85f597 100644
--- a/packages/type/scss/_scale.scss
+++ b/packages/type/scss/_scale.scss
@@ -24,6 +24,31 @@
 /// @type Map
 /// @access public
 /// @group @carbon/type
+/* 
+  12px = carbon--type-scale(1)
+  14px = carbon--type-scale(2)
+  16px = carbon--type-scale(3)
+  18px = carbon--type-scale(4)
+  20px = carbon--type-scale(5)
+  24px = carbon--type-scale(6)
+  28px = carbon--type-scale(7)
+  32px = carbon--type-scale(8)
+  36px = carbon--type-scale(9)
+  42px = carbon--type-scale(10)
+  48px = carbon--type-scale(11)
+  54px = carbon--type-scale(12)
+  60px = carbon--type-scale(13)
+  68px = carbon--type-scale(14)
+  76px = carbon--type-scale(15)
+  84px = carbon--type-scale(16)
+  92px = carbon--type-scale(17)
+  102px = carbon--type-scale(18)
+  112px = carbon--type-scale(19)
+  122px = carbon--type-scale(20)
+  132px = carbon--type-scale(21)
+  144px = carbon--type-scale(22)
+  156px = carbon--type-scale(23)
+*/
 $carbon--type-scale: ();
 @for $i from 1 through 23 {
   $carbon--type-scale: append(
diff --git a/packages/type/src/scale.js b/packages/type/src/scale.js
index cc62b41f48b2..85de2063623f 100644
--- a/packages/type/src/scale.js
+++ b/packages/type/src/scale.js
@@ -24,28 +24,30 @@ export function getTypeSize(step) {
  *
  * > Array.from({ length: 23 }, (_, i) => getTypeSize(i + 1))
  */
+
+//values in pixels
 export const scale = [
-  12,
-  14,
-  16,
-  18,
-  20,
-  24,
-  28,
-  32,
-  36,
-  42,
-  48,
-  54,
-  60,
-  68,
-  76,
-  84,
-  92,
-  102,
-  112,
-  122,
-  132,
-  144,
-  156,
+  12, //scale[0]
+  14, //scale[1]
+  16, //scale[2]
+  18, //scale[3]
+  20, //scale[4]
+  24, //scale[5]
+  28, //scale[6]
+  32, //scale[7]
+  36, //scale[8]
+  42, //scale[9]
+  48, //scale[10]
+  54, //scale[11]
+  60, //scale[12]
+  68, //scale[13]
+  76, //scale[14]
+  84, //scale[15]
+  92, //scale[16]
+  102, //scale[17]
+  112, //scale[18]
+  122, //scale[19]
+  132, //scale[20]
+  144, //scale[21]
+  156, //scale[22]
 ];

From 2d9003237d98a36435f2ac35307b01d79a039a42 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Fri, 19 Aug 2022 17:02:01 -0500
Subject: [PATCH 08/11] chore: update type tests and snapshots

---
 .../type/src/__tests__/__snapshots__/styles-test.js.snap | 8 ++++----
 packages/type/src/__tests__/fluid-test.js                | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/type/src/__tests__/__snapshots__/styles-test.js.snap b/packages/type/src/__tests__/__snapshots__/styles-test.js.snap
index eb1299e39f75..7736cc47d58f 100644
--- a/packages/type/src/__tests__/__snapshots__/styles-test.js.snap
+++ b/packages/type/src/__tests__/__snapshots__/styles-test.js.snap
@@ -101,14 +101,14 @@ letter-spacing: 0;"
 `;
 
 exports[`styles display03 should be printable 1`] = `
-"font-size: 3rem;
+"font-size: 2.625rem;
 font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
 `;
 
 exports[`styles display04 should be printable 1`] = `
-"font-size: 3rem;
+"font-size: 2.625rem;
 font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
@@ -178,14 +178,14 @@ letter-spacing: 0;"
 `;
 
 exports[`styles fluidDisplay03 should be printable 1`] = `
-"font-size: 3rem;
+"font-size: 2.625rem;
 font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
 `;
 
 exports[`styles fluidDisplay04 should be printable 1`] = `
-"font-size: 3rem;
+"font-size: 2.625rem;
 font-weight: 300;
 line-height: 1.19;
 letter-spacing: 0;"
diff --git a/packages/type/src/__tests__/fluid-test.js b/packages/type/src/__tests__/fluid-test.js
index 6406ea517dc0..70f0525054ee 100644
--- a/packages/type/src/__tests__/fluid-test.js
+++ b/packages/type/src/__tests__/fluid-test.js
@@ -44,17 +44,16 @@ describe('fluid', () => {
       Object {
         "@media (min-width: 42rem)": Object {
           "fontSize": "calc(4.25rem + 1.5 * ((100vw - 42rem) / 24))",
-          "lineHeight": 1.15,
+          "lineHeight": 1.14,
         },
         "@media (min-width: 66rem)": Object {
           "fontSize": "calc(5.75rem + 1.875 * ((100vw - 66rem) / 16))",
           "letterSpacing": "-0.64px",
-          "lineHeight": 1.11,
+          "lineHeight": 1.1,
         },
         "@media (min-width: 82rem)": Object {
           "fontSize": "calc(7.625rem + 2.125 * ((100vw - 82rem) / 17))",
-          "letterSpacing": "-0.64px",
-          "lineHeight": 1.07,
+          "lineHeight": 1.06,
         },
         "@media (min-width: 99rem)": Object {
           "fontSize": "9.75rem",
@@ -62,7 +61,7 @@ describe('fluid', () => {
           "lineHeight": 1.05,
         },
         "fontSize": "calc(2.625rem + 1.625 * ((100vw - 20rem) / 22))",
-        "fontWeight": 600,
+        "fontWeight": 300,
         "letterSpacing": 0,
         "lineHeight": 1.19,
       }

From dedefa4ec138bfe59b655b58a4bd99727db8329f Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Mon, 22 Aug 2022 13:18:08 -0500
Subject: [PATCH 09/11] fix: update comment

---
 packages/type/scss/_scale.scss | 49 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/packages/type/scss/_scale.scss b/packages/type/scss/_scale.scss
index e6affa85f597..d664f5e037da 100644
--- a/packages/type/scss/_scale.scss
+++ b/packages/type/scss/_scale.scss
@@ -24,31 +24,6 @@
 /// @type Map
 /// @access public
 /// @group @carbon/type
-/* 
-  12px = carbon--type-scale(1)
-  14px = carbon--type-scale(2)
-  16px = carbon--type-scale(3)
-  18px = carbon--type-scale(4)
-  20px = carbon--type-scale(5)
-  24px = carbon--type-scale(6)
-  28px = carbon--type-scale(7)
-  32px = carbon--type-scale(8)
-  36px = carbon--type-scale(9)
-  42px = carbon--type-scale(10)
-  48px = carbon--type-scale(11)
-  54px = carbon--type-scale(12)
-  60px = carbon--type-scale(13)
-  68px = carbon--type-scale(14)
-  76px = carbon--type-scale(15)
-  84px = carbon--type-scale(16)
-  92px = carbon--type-scale(17)
-  102px = carbon--type-scale(18)
-  112px = carbon--type-scale(19)
-  122px = carbon--type-scale(20)
-  132px = carbon--type-scale(21)
-  144px = carbon--type-scale(22)
-  156px = carbon--type-scale(23)
-*/
 $carbon--type-scale: ();
 @for $i from 1 through 23 {
   $carbon--type-scale: append(
@@ -62,6 +37,30 @@ $carbon--type-scale: ();
 /// @return {Number} In rem
 /// @access public
 /// @group @carbon/type
+/// 12px = carbon--type-scale(1)
+/// 14px = carbon--type-scale(2)
+/// 16px = carbon--type-scale(3)
+/// 18px = carbon--type-scale(4)
+/// 20px = carbon--type-scale(5)
+/// 24px = carbon--type-scale(6)
+/// 28px = carbon--type-scale(7)
+/// 32px = carbon--type-scale(8)
+/// 36px = carbon--type-scale(9)
+/// 42px = carbon--type-scale(10)
+/// 48px = carbon--type-scale(11)
+/// 54px = carbon--type-scale(12)
+/// 60px = carbon--type-scale(13)
+/// 68px = carbon--type-scale(14)
+/// 76px = carbon--type-scale(15)
+/// 84px = carbon--type-scale(16)
+/// 92px = carbon--type-scale(17)
+///102px = carbon--type-scale(18)
+///112px = carbon--type-scale(19)
+///122px = carbon--type-scale(20)
+///132px = carbon--type-scale(21)
+///144px = carbon--type-scale(22)
+///156px = carbon--type-scale(23)
+
 @function carbon--type-scale($step) {
   @return nth($carbon--type-scale, $step);
 }

From 674399e520332b687a44c93588d35ed2a68faff3 Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <josefinanoemi4@gmail.com>
Date: Mon, 22 Aug 2022 14:34:59 -0500
Subject: [PATCH 10/11] chore: update grid snapshot

---
 .../src/globals/grid/__tests__/__snapshots__/grid-test.js.snap  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap b/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap
index 66f5e5394cee..46866137e742 100644
--- a/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap
+++ b/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap
@@ -9,7 +9,7 @@ exports[`_grid.scss should generate grid code when the grid feature flag is on 1
 
 h2 {
   font-size: 2rem;
-  font-weight: 400;
+  font-weight: 300;
   line-height: 1.25;
   letter-spacing: 0; }
 

From 3d1b0ccce05b157fd2f7d884b95483971a8f7a8d Mon Sep 17 00:00:00 2001
From: Josefina Mancilla <32556167+jnm2377@users.noreply.github.com>
Date: Mon, 22 Aug 2022 15:36:01 -0500
Subject: [PATCH 11/11] Update packages/type/scss/_scale.scss

Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com>
---
 packages/type/scss/_scale.scss | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/packages/type/scss/_scale.scss b/packages/type/scss/_scale.scss
index d664f5e037da..6074bd6c178a 100644
--- a/packages/type/scss/_scale.scss
+++ b/packages/type/scss/_scale.scss
@@ -37,30 +37,6 @@ $carbon--type-scale: ();
 /// @return {Number} In rem
 /// @access public
 /// @group @carbon/type
-/// 12px = carbon--type-scale(1)
-/// 14px = carbon--type-scale(2)
-/// 16px = carbon--type-scale(3)
-/// 18px = carbon--type-scale(4)
-/// 20px = carbon--type-scale(5)
-/// 24px = carbon--type-scale(6)
-/// 28px = carbon--type-scale(7)
-/// 32px = carbon--type-scale(8)
-/// 36px = carbon--type-scale(9)
-/// 42px = carbon--type-scale(10)
-/// 48px = carbon--type-scale(11)
-/// 54px = carbon--type-scale(12)
-/// 60px = carbon--type-scale(13)
-/// 68px = carbon--type-scale(14)
-/// 76px = carbon--type-scale(15)
-/// 84px = carbon--type-scale(16)
-/// 92px = carbon--type-scale(17)
-///102px = carbon--type-scale(18)
-///112px = carbon--type-scale(19)
-///122px = carbon--type-scale(20)
-///132px = carbon--type-scale(21)
-///144px = carbon--type-scale(22)
-///156px = carbon--type-scale(23)
-
 @function carbon--type-scale($step) {
   @return nth($carbon--type-scale, $step);
 }