diff --git a/client/src/components/Draftail/Tooltip/Tooltip.scss b/client/src/components/Draftail/Tooltip/Tooltip.scss index dcd3c56f82..fe2c74af1a 100644 --- a/client/src/components/Draftail/Tooltip/Tooltip.scss +++ b/client/src/components/Draftail/Tooltip/Tooltip.scss @@ -71,6 +71,7 @@ $tooltip-z-index: $draftail-tooltip-z-index; } .Tooltip__link { + @include font-smoothing; font-size: 0.875rem; margin-right: $controls-spacing * 4; display: inline-block; diff --git a/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss b/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss index 6f01f9014e..5ca1d72d7c 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss @@ -5,6 +5,12 @@ // Please note that the mixins partial shouldn't include any classes. This is so // it can be included in any file without accidentally producing output +// Turns on font-smoothing when used. Use sparingly. +@mixin font-smoothing { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + @mixin clearfix() { &:before, &:after { @@ -86,6 +92,7 @@ @mixin icon () { + @include font-smoothing; font-family: 'wagtail'; font-style: normal; font-weight: normal; @@ -95,8 +102,6 @@ text-decoration: none; width: 1.3em; line-height: 1em; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; text-align: left; vertical-align: middle; margin-right: 0.2em; diff --git a/wagtail/admin/static_src/wagtailadmin/scss/components/_messages.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_messages.scss index f264ce45ac..84a469596f 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/components/_messages.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/components/_messages.scss @@ -25,11 +25,10 @@ } > ul > li:before { + @include font-smoothing; margin-right: 0.5em; font-size: 1.5em; vertical-align: middle; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; } .error { diff --git a/wagtail/admin/static_src/wagtailadmin/scss/components/_tabs.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_tabs.scss index 5b51dd25de..499538f436 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/components/_tabs.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/components/_tabs.scss @@ -65,6 +65,7 @@ li.settings a { &:before { + @include font-smoothing; font-family: wagtail; vertical-align: middle; text-transform: none; @@ -72,8 +73,6 @@ margin-right: 0.5em; font-size: 1.2em; font-weight: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; } } diff --git a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss index 1c2ae27329..bd76e42db7 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss @@ -125,6 +125,7 @@ $object-title-height: 40px; &:before, label:before { + @include font-smoothing; text-shadow: none; font-family: wagtail; text-transform: none; @@ -142,8 +143,6 @@ $object-title-height: 40px; padding: 0; margin: 0; background-color: $color-salmon; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; } }