ENGCOM-3044: Fixed issue with lib-line-height mixin failing when value of 'normal'… #18168

magento-engcom-team · magento-engcom-team · commit 36d41522a6c9 · 2018-09-26T03:33:20.000-05:00
- Merge Pull Request #18168 from CNanninga/magento2:feature/line-height-mixin-fix - Merged commits: 1. 09ce6c9
diff --git a/lib/web/css/source/lib/_typography.less b/lib/web/css/source/lib/_typography.less
@@ -37,7 +37,7 @@
 }
 
 //  Rem line height
-.lib-line-height(@heightValue) when not (@heightValue = false) and not (ispercentage(@heightValue)) {
+.lib-line-height(@heightValue) when not (@heightValue = false) and not (@heightValue = normal) and not (ispercentage(@heightValue)) {
     .lib-font-size-value(@heightValue);
     .lib-css(line-height, @fontValue);
 }
@@ -46,6 +46,10 @@
     .lib-css(line-height, @heightValue);
 }
 
+.lib-line-height(@heightValue) when (@heightValue = normal) {
+    .lib-css(line-height, @heightValue);
+}
+
 .lib-wrap-words() {
     overflow-wrap: break-word;
     word-wrap: break-word;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// Rem line height`
`40`		`-.lib-line-height(@heightValue) when not (@heightValue = false) and not (ispercentage(@heightValue)) {`
	`40`	`+.lib-line-height(@heightValue) when not (@heightValue = false) and not (@heightValue = normal) and not (ispercentage(@heightValue)) {`
`41`	`41`	`.lib-font-size-value(@heightValue);`
`42`	`42`	`.lib-css(line-height, @fontValue);`
`43`	`43`	`}`
`@@ -46,6 +46,10 @@`
`46`	`46`	`.lib-css(line-height, @heightValue);`
`47`	`47`	`}`
`48`	`48`
	`49`	`+.lib-line-height(@heightValue) when (@heightValue = normal) {`
	`50`	`+ .lib-css(line-height, @heightValue);`
	`51`	`+}`
	`52`	`+`
`49`	`53`	`.lib-wrap-words() {`
`50`	`54`	`overflow-wrap: break-word;`
`51`	`55`	`word-wrap: break-word;`