diff --git a/sass/fonts/_firasans.scss b/sass/fonts/_firasans.scss index b6bed6f85d..48f59d555b 100644 --- a/sass/fonts/_firasans.scss +++ b/sass/fonts/_firasans.scss @@ -1,69 +1,21 @@ -/* fira-sans-300 - latin */ -@font-face { +@font-face { font-family: "Fira Sans"; + font-display: swap; + font-weight: 100 900; font-style: normal; - font-weight: 300; - src: url("/assets/fonts/fira-sans-v10-latin-300.eot"); /* IE9 Compat Modes */ - src: local("Fira Sans Light"), local("FiraSans-Light"), - url("/assets/fonts/fira-sans-v10-latin-300.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ - url("/assets/fonts/fira-sans-v10-latin-300.woff2") format("woff2"), /* Super Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-300.woff") format("woff"), /* Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-300.ttf") format("truetype"), /* Safari, Android, iOS */ - url("/assets/fonts/fira-sans-v10-latin-300.svg#FiraSans") format("svg"); /* Legacy iOS */ + src: local("Firava"), + url("/assets/fonts/firava-sans.woff2") format("woff2 supports variations"), + url("/assets/fonts/firava-sans.woff2") format("woff2-variations"), + url("/assets/fonts/firava-sans.ttf") format("truetype-variation"); } -/* fira-sans-regular - latin */ -@font-face { - font-family: "Fira Sans"; - font-style: normal; - font-weight: 400; - src: url("/assets/fonts/fira-sans-v10-latin-regular.eot"); /* IE9 Compat Modes */ - src: local("Fira Sans Regular"), local("FiraSans-Regular"), - url("/assets/fonts/fira-sans-v10-latin-regular.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ - url("/assets/fonts/fira-sans-v10-latin-regular.woff2") format("woff2"), /* Super Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-regular.woff") format("woff"), /* Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-regular.ttf") format("truetype"), /* Safari, Android, iOS */ - url("/assets/fonts/fira-sans-v10-latin-regular.svg#FiraSans") format("svg"); /* Legacy iOS */ -} - -/* fira-sans-italic - latin */ -@font-face { +@font-face { font-family: "Fira Sans"; + font-display: swap; + font-weight: 100 900; font-style: italic; - font-weight: 400; - src: url("/assets/fonts/fira-sans-v10-latin-italic.eot"); /* IE9 Compat Modes */ - src: local("Fira Sans Italic"), local("FiraSans-Italic"), - url("/assets/fonts/fira-sans-v10-latin-italic.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ - url("/assets/fonts/fira-sans-v10-latin-italic.woff2") format("woff2"), /* Super Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-italic.woff") format("woff"), /* Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-italic.ttf") format("truetype"), /* Safari, Android, iOS */ - url("/assets/fonts/fira-sans-v10-latin-italic.svg#FiraSans") format("svg"); /* Legacy iOS */ -} - -/* fira-sans-500 - latin */ -@font-face { - font-family: "Fira Sans"; - font-style: normal; - font-weight: 500; - src: url("/assets/fonts/fira-sans-v10-latin-500.eot"); /* IE9 Compat Modes */ - src: local("Fira Sans Medium"), local("FiraSans-Medium"), - url("/assets/fonts/fira-sans-v10-latin-500.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ - url("/assets/fonts/fira-sans-v10-latin-500.woff2") format("woff2"), /* Super Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-500.woff") format("woff"), /* Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-500.ttf") format("truetype"), /* Safari, Android, iOS */ - url("/assets/fonts/fira-sans-v10-latin-500.svg#FiraSans") format("svg"); /* Legacy iOS */ -} - -/* fira-sans-800 - latin */ -@font-face { - font-family: "Fira Sans"; - font-style: normal; - font-weight: 800; - src: url("/assets/fonts/fira-sans-v10-latin-800.eot"); /* IE9 Compat Modes */ - src: local("Fira Sans ExtraBold"), local("FiraSans-ExtraBold"), - url("/assets/fonts/fira-sans-v10-latin-800.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ - url("/assets/fonts/fira-sans-v10-latin-800.woff2") format("woff2"), /* Super Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-800.woff") format("woff"), /* Modern Browsers */ - url("/assets/fonts/fira-sans-v10-latin-800.ttf") format("truetype"), /* Safari, Android, iOS */ - url("/assets/fonts/fira-sans-v10-latin-800.svg#FiraSans") format("svg"); /* Legacy iOS */ + src: local("Firava Italic"), + url("/assets/fonts/firava-sans-italic.woff2") format("woff2 supports variations"), + url("/assets/fonts/firava-sans-italic.woff2") format("woff2-variations"), + url("/assets/fonts/firava-sans-italic.ttf") format("truetype-variation"); } diff --git a/static/assets/fonts/fira-sans-v10-latin-300.eot b/static/assets/fonts/fira-sans-v10-latin-300.eot deleted file mode 100644 index b8c6d87389..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-300.eot and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-300.svg b/static/assets/fonts/fira-sans-v10-latin-300.svg deleted file mode 100644 index 17349883f3..0000000000 --- a/static/assets/fonts/fira-sans-v10-latin-300.svg +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/assets/fonts/fira-sans-v10-latin-300.ttf b/static/assets/fonts/fira-sans-v10-latin-300.ttf deleted file mode 100644 index 276d25d9b1..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-300.ttf and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-300.woff b/static/assets/fonts/fira-sans-v10-latin-300.woff deleted file mode 100644 index b685c1e2a6..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-300.woff and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-300.woff2 b/static/assets/fonts/fira-sans-v10-latin-300.woff2 deleted file mode 100644 index 5717eb1dcb..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-300.woff2 and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-500.eot b/static/assets/fonts/fira-sans-v10-latin-500.eot deleted file mode 100644 index 810f5c5adf..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-500.eot and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-500.svg b/static/assets/fonts/fira-sans-v10-latin-500.svg deleted file mode 100644 index fd63c00a57..0000000000 --- a/static/assets/fonts/fira-sans-v10-latin-500.svg +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/assets/fonts/fira-sans-v10-latin-500.ttf b/static/assets/fonts/fira-sans-v10-latin-500.ttf deleted file mode 100644 index c5c4850242..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-500.ttf and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-500.woff b/static/assets/fonts/fira-sans-v10-latin-500.woff deleted file mode 100644 index d64a1e1881..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-500.woff and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-500.woff2 b/static/assets/fonts/fira-sans-v10-latin-500.woff2 deleted file mode 100644 index bb32b14d6b..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-500.woff2 and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-800.eot b/static/assets/fonts/fira-sans-v10-latin-800.eot deleted file mode 100644 index ffcc368feb..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-800.eot and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-800.svg b/static/assets/fonts/fira-sans-v10-latin-800.svg deleted file mode 100644 index bc32da17ad..0000000000 --- a/static/assets/fonts/fira-sans-v10-latin-800.svg +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/assets/fonts/fira-sans-v10-latin-800.ttf b/static/assets/fonts/fira-sans-v10-latin-800.ttf deleted file mode 100644 index 6ffb490c13..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-800.ttf and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-800.woff b/static/assets/fonts/fira-sans-v10-latin-800.woff deleted file mode 100644 index cac479b79d..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-800.woff and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-800.woff2 b/static/assets/fonts/fira-sans-v10-latin-800.woff2 deleted file mode 100644 index 37a989c620..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-800.woff2 and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-italic.eot b/static/assets/fonts/fira-sans-v10-latin-italic.eot deleted file mode 100644 index bd8184c35c..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-italic.eot and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-italic.svg b/static/assets/fonts/fira-sans-v10-latin-italic.svg deleted file mode 100644 index 55ceba89b2..0000000000 --- a/static/assets/fonts/fira-sans-v10-latin-italic.svg +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/assets/fonts/fira-sans-v10-latin-italic.ttf b/static/assets/fonts/fira-sans-v10-latin-italic.ttf deleted file mode 100644 index 416c710dd1..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-italic.ttf and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-italic.woff b/static/assets/fonts/fira-sans-v10-latin-italic.woff deleted file mode 100644 index 5e82e183f3..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-italic.woff and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-italic.woff2 b/static/assets/fonts/fira-sans-v10-latin-italic.woff2 deleted file mode 100644 index 7f191fd8ea..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-italic.woff2 and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-regular.eot b/static/assets/fonts/fira-sans-v10-latin-regular.eot deleted file mode 100644 index 7abf4c2f68..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-regular.eot and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-regular.svg b/static/assets/fonts/fira-sans-v10-latin-regular.svg deleted file mode 100644 index 1e520978de..0000000000 --- a/static/assets/fonts/fira-sans-v10-latin-regular.svg +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/assets/fonts/fira-sans-v10-latin-regular.ttf b/static/assets/fonts/fira-sans-v10-latin-regular.ttf deleted file mode 100644 index 572e442e38..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-regular.ttf and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-regular.woff b/static/assets/fonts/fira-sans-v10-latin-regular.woff deleted file mode 100644 index d99ba57a35..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-regular.woff and /dev/null differ diff --git a/static/assets/fonts/fira-sans-v10-latin-regular.woff2 b/static/assets/fonts/fira-sans-v10-latin-regular.woff2 deleted file mode 100644 index 9bb576032e..0000000000 Binary files a/static/assets/fonts/fira-sans-v10-latin-regular.woff2 and /dev/null differ diff --git a/static/assets/fonts/firava-sans-italic.ttf b/static/assets/fonts/firava-sans-italic.ttf new file mode 100644 index 0000000000..7038345222 Binary files /dev/null and b/static/assets/fonts/firava-sans-italic.ttf differ diff --git a/static/assets/fonts/firava-sans-italic.woff2 b/static/assets/fonts/firava-sans-italic.woff2 new file mode 100644 index 0000000000..bdf5c41ebd Binary files /dev/null and b/static/assets/fonts/firava-sans-italic.woff2 differ diff --git a/static/assets/fonts/firava-sans.ttf b/static/assets/fonts/firava-sans.ttf new file mode 100644 index 0000000000..9fee39e84d Binary files /dev/null and b/static/assets/fonts/firava-sans.ttf differ diff --git a/static/assets/fonts/firava-sans.woff2 b/static/assets/fonts/firava-sans.woff2 new file mode 100644 index 0000000000..94c7488874 Binary files /dev/null and b/static/assets/fonts/firava-sans.woff2 differ