diff --git a/zul/src/main/resources/web/zul/less/font/_core.less b/zul/src/main/resources/web/zul/less/font/_core.less index 550f83075c0..c92e5a7f391 100644 --- a/zul/src/main/resources/web/zul/less/font/_core.less +++ b/zul/src/main/resources/web/zul/less/font/_core.less @@ -15,12 +15,12 @@ .@{fa-css-prefix}-regular, .fab, .@{fa-css-prefix}-brands { - -moz-osx-font-smoothing: grayscale; + display: inline-block; + font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration + font-size: inherit; // can't have font-size inherit on line above, so need to override + text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; - display: ~'var(--@{fa-css-prefix}-display, @{fa-display})'; - font-style: normal; - font-variant: normal; - text-rendering: auto; + -moz-osx-font-smoothing: grayscale; } .fas, diff --git a/zul/src/main/resources/web/zul/less/font/_variables.less b/zul/src/main/resources/web/zul/less/font/_variables.less index 6cba8c8d9e5..241560e0be5 100644 --- a/zul/src/main/resources/web/zul/less/font/_variables.less +++ b/zul/src/main/resources/web/zul/less/font/_variables.less @@ -6,6 +6,8 @@ @fa-style-family : 'FontAwesome'; @fa-display : inline-block; +@fa-font-size-base : 14px; +@fa-line-height-base : 1; @fa-fw-width : (20em / 16); @fa-inverse : #fff;