fix(font-size): Backport #3832 to fix regression on body font size (#3845)

brandonferrua · web-flow · commit d08e33c74d52 · 2019-05-23T13:45:35.000-07:00
* fix(font-size): Backport #3832 to fix regression on body font size

* Fix version in config
diff --git a/RELEASENOTES.general.md b/RELEASENOTES.general.md
@@ -1,5 +1,11 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- On release, add general notes here. In time the legacy relase notes will be add to this -->
+## 2.9.3 - May 24, 2019
+
+## Fix
+
+- Fix `font-size` of `body` to adjust when on a touch-enabled device
+
 ## 2.9.2 - May 7, 2019
 
 ## General
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,6 +1,11 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
 
+## Release 2.9.3 - May 24, 2019
+
+## Fix
+- Fix `font-size` of `body` to adjust when on a touch-enabled device
+
 ## Release 2.9.2 - May 7, 2019
 
 ## General
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "design-system",
   "description": "Salesforce Lightning Design System",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "author": "Salesforce",
   "slds": {
     "name": "Summer ’19",
diff --git a/ui/dependencies/_layout.scss b/ui/dependencies/_layout.scss
@@ -53,6 +53,13 @@
   }
 }
 
+// Touch-enabled devices without hover
+@mixin touch-device {
+  @media (pointer: coarse) and (hover: none) {
+    @content;
+  }
+}
+
 // Wrapping Helper
 @mixin flex-wrap($wrap: true) {
   @if $wrap {
diff --git a/ui/dependencies/_root.scss b/ui/dependencies/_root.scss
@@ -17,5 +17,9 @@
   #{$body} {
     font-size: $font-size-3;
     background: transparent;
+
+    @include touch-device {
+      font-size: $font-size-5;
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "design-system",`
`3`	`3`	`"description": "Salesforce Lightning Design System",`
`4`		`- "version": "2.9.2",`
	`4`	`+ "version": "2.9.3",`
`5`	`5`	`"author": "Salesforce",`
`6`	`6`	`"slds": {`
`7`	`7`	`"name": "Summer ’19",`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,13 @@`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
	`56`	`+// Touch-enabled devices without hover`
	`57`	`+@mixin touch-device {`
	`58`	`+ @media (pointer: coarse) and (hover: none) {`
	`59`	`+ @content;`
	`60`	`+ }`
	`61`	`+}`
	`62`	`+`
`56`	`63`	`// Wrapping Helper`
`57`	`64`	`@mixin flex-wrap($wrap: true) {`
`58`	`65`	`@if $wrap {`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,9 @@`
`17`	`17`	`#{$body} {`
`18`	`18`	`font-size: $font-size-3;`
`19`	`19`	`background: transparent;`
	`20`	`+`
	`21`	`+ @include touch-device {`
	`22`	`+ font-size: $font-size-5;`
	`23`	`+ }`
`20`	`24`	`}`
`21`	`25`	`}`