diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.ttf deleted file mode 100755 index 59c1f3ac9..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bold.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf deleted file mode 100755 index d97ecff04..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-bolditalic.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.ttf deleted file mode 100755 index fb05d00ea..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-italic.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.ttf deleted file mode 100755 index 7812d25af..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-light.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf deleted file mode 100755 index c9f6e41e4..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-lightitalic.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.ttf deleted file mode 100755 index c1ccf003d..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-regular.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.ttf deleted file mode 100755 index 3eba3530a..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibold.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf deleted file mode 100755 index d105bbbb2..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/opensans-semibolditalic.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf deleted file mode 100755 index 070f48a49..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-bold.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf deleted file mode 100755 index fc7cdabbb..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/robotoslab-regular.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.eot b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.eot deleted file mode 100755 index cb75341e6..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.eot and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.svg b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.svg deleted file mode 100755 index fca3e22d4..000000000 --- a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.ttf b/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.ttf deleted file mode 100755 index 4bcedac2c..000000000 Binary files a/wagtail/admin/static_src/wagtailadmin/fonts/wagtail.ttf and /dev/null differ diff --git a/wagtail/admin/static_src/wagtailadmin/scss/_font-icons.scss b/wagtail/admin/static_src/wagtailadmin/scss/_font-icons.scss index 39230e026..338387c72 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/_font-icons.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/_font-icons.scss @@ -1,19 +1,7 @@ // The wagtail font isn't available in WOFF2, so a @font-face is set here without a mixin. @font-face { font-family: 'wagtail'; - src: url('#{$font-root}wagtail.eot'); - src: url('#{$font-root}wagtail.eot?#iefix') format('embedded-opentype'), - url('#{$font-root}wagtail.ttf') format('truetype'), - url('#{$font-root}wagtail.svg#wagtail') format('svg'), - url('#{$font-root}wagtail.woff') format('woff'); + src: url('#{$font-root}wagtail.woff') format('woff'); font-weight: normal; font-style: normal; } - -// One exception to the limited font formats used above is the Wagtail icon font for Windows, where using the SVG version improves antialiasing -@media screen and (-webkit-min-device-pixel-ratio: 0) { - @font-face { - font-family: 'wagtail'; - src: url('#{$font-root}wagtail.svg#wagtail') format('svg'); - } -} diff --git a/wagtail/admin/static_src/wagtailadmin/scss/_fonts.scss b/wagtail/admin/static_src/wagtailadmin/scss/_fonts.scss index 76cf7391c..467251cb7 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/_fonts.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/_fonts.scss @@ -1,15 +1,13 @@ // NB: Due to Wagtail's browser support the following @font-face formats are required: // - WOFF for modern browsers // - WOFF2 For super-modern browsers -// - TTF for older Android & iOS // // This example is all we need now: // // @font-face { // font-family: 'MyWebFont'; // src: url('myfont.woff2') format('woff2'), -// url('myfont.woff') format('woff'), -// url('myfont.ttf') format('truetype'); +// url('myfont.woff') format('woff'); // } // // See https://css-tricks.com/snippets/css/using-font-face/ for more information. diff --git a/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss b/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss index 583ac7393..8bb412eed 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/_mixins.scss @@ -114,8 +114,7 @@ @font-face { font-family: '#{$fontname}'; src: url('#{$font-root}#{$filestub}.woff2') format('woff2'), - url('#{$font-root}#{$filestub}.woff') format('woff'), - url('#{$font-root}#{$filestub}.ttf') format('truetype'); + url('#{$font-root}#{$filestub}.woff') format('woff'); font-weight: $weight; font-style: $style; }