Merge branch 'main' into tobiasahlin/dont-confuse-sizes-with-breakpoints

jonrohan · web-flow · commit d3d0bba565cf · 2021-05-05T10:00:42.000-07:00
diff --git a/deprecations.js b/deprecations.js
@@ -6,11 +6,11 @@
 const versionDeprecations = {
   '17.0.0': [
     {
-      selectors: [
-          '.h000-mktg',
-          '.h00-mktg',
-          '.lead-mktg'
-      ],
+      variables: ['$h000-size', '$h000-size-mobile'],
+      message: `This variable is deprecated, please refer to the Marketing Typography documentation.`
+    },
+    {
+      selectors: ['.h000-mktg', '.h00-mktg', '.lead-mktg'],
       message: `This selector is deprecated, please refer to the Marketing Typography documentation.`
     },
     {
diff --git a/src/marketing/support/variables.scss b/src/marketing/support/variables.scss
@@ -1,3 +1,4 @@
+// stylelint-disable unit-no-unknown
 // Typography
 $marketing-font-path: "/fonts/" !default;
 
diff --git a/src/marketing/type/typography.scss b/src/marketing/type/typography.scss
@@ -8,6 +8,7 @@
 .h6-mktg {
   font-family: $font-mktg;
   font-feature-settings: $mktg-font-feature-settings;
+  // stylelint-disable-next-line primer/typography
   font-weight: $mktg-header-weight-default !important;
   letter-spacing: $mktg-header-spacing-default !important;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// stylelint-disable unit-no-unknown`
`1`	`2`	`// Typography`
`2`	`3`	`$marketing-font-path: "/fonts/" !default;`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`.h6-mktg {`
`9`	`9`	`font-family: $font-mktg;`
`10`	`10`	`font-feature-settings: $mktg-font-feature-settings;`
	`11`	`+ // stylelint-disable-next-line primer/typography`
`11`	`12`	`font-weight: $mktg-header-weight-default !important;`
`12`	`13`	`letter-spacing: $mktg-header-spacing-default !important;`
`13`	`14`	`}`