diff --git a/package.json b/package.json index 146709b6c39693cebd46bcdeaa3ea631a0c81e7f..e6956aa06bf787fc889495a40e1faa2403300659 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,11 @@ "author": "Luc Rocher ", "license": "MIT", "dependencies": { + "@fontsource/fira-sans": "^4.5.0", "bootstrap": "4.0.0-alpha.6", "font-awesome": "^4.7.0", + "jquery": "^3.6.0", + "tether": "^2.0.0", "select2": "^4.0.13", "select2-bootstrap-theme": "^0.1.0-beta.10", "simplemde": "^1.11.2" diff --git a/static/src/components/button.css b/static/src/components/button.css index 5353109d4074c8d30cdb4dea813b866bbedd5a7a..29eb4044717c93a10684eb7cabcab68150374fa7 100644 --- a/static/src/components/button.css +++ b/static/src/components/button.css @@ -3,7 +3,8 @@ border-radius: 0px; padding-left: 38px; padding-right: 38px; - font-family: FiraSansRegular; + font-family: "Fira Sans"; + font-weight: 400; } .btn-lg { @@ -15,7 +16,7 @@ .btn em { font-size: 28px; - font-family: SansusWebissimoRegular; + font-family: 'Sansus Webissimo'; } .btn-default, diff --git a/static/src/components/modals.css b/static/src/components/modals.css index d5de1007b516dfcacc0330dfc182dc3088c9cea7..4423385b009b320d94b2a300e85f06e6843aa786 100644 --- a/static/src/components/modals.css +++ b/static/src/components/modals.css @@ -69,7 +69,8 @@ .modal-form.visible .modal-form-body, .modal-form:target .modal-form-body { background-color: #ffffff; - font-family: FiraSansMedium; + font-family: "Fira Sans"; + font-weight: 500; max-height: 75%; overflow: auto; margin-top: 0%; @@ -79,7 +80,7 @@ .modal-form.visible .modal-form-title h1, .modal-form:target .modal-form-title h1 { text-align: center; - font-family: SansusWebissimoRegular; + font-family: 'Sansus Webissimo'; font-size: 42px; color: #3b68b0; margin: 0; diff --git a/static/src/components/panel.css b/static/src/components/panel.css index 1fc701f063b6b1619ddb1b11e42d4264cc05f879..7ad8d335be368c4775edff1ef5c3da3faa4314b6 100644 --- a/static/src/components/panel.css +++ b/static/src/components/panel.css @@ -36,7 +36,8 @@ color: #fff; background-color: #3B68B0; display: block; - font-family: FiraSansRegular; + font-family: "Fira Sans"; + font-weight: 400; font-size: 18px; line-height: 50px; width: 100%; diff --git a/static/src/components/progress.css b/static/src/components/progress.css index 67539ac692ab61f75007933b4f1cb57cf282cf70..91c2f044ab76183472d1ec6d22741adc646b23b4 100644 --- a/static/src/components/progress.css +++ b/static/src/components/progress.css @@ -17,7 +17,8 @@ } .progress-bar span { - font-family: FiraSansMedium; + font-family: "Fira Sans"; + font-weight: 500; font-size: 25px; position: relative; text-align: right; diff --git a/static/src/fonts/FiraSans-Bold.otf b/static/src/fonts/FiraSans-Bold.otf deleted file mode 100644 index 3e586b4254a9f2c350e75d8f7cdee9c9319457af..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Bold.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-BoldItalic.otf b/static/src/fonts/FiraSans-BoldItalic.otf deleted file mode 100644 index 211d6e8d5d35a03a5ebfebf623e88bbbf6de8aed..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-BoldItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Book.otf b/static/src/fonts/FiraSans-Book.otf deleted file mode 100644 index 20bc9a1947eeee0f69b3fc271f52a6111c6d5b87..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Book.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-BookItalic.otf b/static/src/fonts/FiraSans-BookItalic.otf deleted file mode 100644 index 948c96f4cae8b93f079023a723020c4dd231d80f..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-BookItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Eight.otf b/static/src/fonts/FiraSans-Eight.otf deleted file mode 100644 index a06e1f6f9b6cc8792a7abd8a199b8aeff11b2e3f..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Eight.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-EightItalic.otf b/static/src/fonts/FiraSans-EightItalic.otf deleted file mode 100644 index 162375dad6411fa7d3c211186a84218ff0c297d6..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-EightItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-ExtraBold.otf b/static/src/fonts/FiraSans-ExtraBold.otf deleted file mode 100644 index c3567457e8add4574bdf311f913731e36c715367..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-ExtraBold.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-ExtraBoldItalic.otf b/static/src/fonts/FiraSans-ExtraBoldItalic.otf deleted file mode 100644 index 965e330190dfc1de47877122e1b37db2924e5713..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-ExtraBoldItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-ExtraLight.otf b/static/src/fonts/FiraSans-ExtraLight.otf deleted file mode 100644 index ca309718f2ed1aadc9a81e4d957e40899f207e5c..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-ExtraLight.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-ExtraLightItalic.otf b/static/src/fonts/FiraSans-ExtraLightItalic.otf deleted file mode 100644 index dc6a254e88e3f2810b0bda383d1f4091e02371e6..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-ExtraLightItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Four.otf b/static/src/fonts/FiraSans-Four.otf deleted file mode 100644 index 97afc1c44e352bc6be8252216552ca235789d760..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Four.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-FourItalic.otf b/static/src/fonts/FiraSans-FourItalic.otf deleted file mode 100644 index a8b18f0d9a7538cdb076668b01c3594f5bdb99ca..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-FourItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Hair.otf b/static/src/fonts/FiraSans-Hair.otf deleted file mode 100644 index 1853f5e37350ae981e5d78f481d86aa525c88f48..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Hair.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-HairItalic.otf b/static/src/fonts/FiraSans-HairItalic.otf deleted file mode 100644 index ddc2a2368687c2818e59cc72546d2a7aefab387f..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-HairItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Heavy.otf b/static/src/fonts/FiraSans-Heavy.otf deleted file mode 100644 index 1bd93206a87f85717bdf07a3b4c0dd1966040717..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Heavy.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-HeavyItalic.otf b/static/src/fonts/FiraSans-HeavyItalic.otf deleted file mode 100644 index a74809039ff3bc05fcc5736bf0d3a49375fb4f07..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-HeavyItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Italic.otf b/static/src/fonts/FiraSans-Italic.otf deleted file mode 100644 index b5b9e85faed192d2f81cc698bcdd7b5fcceddd82..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Italic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Light.otf b/static/src/fonts/FiraSans-Light.otf deleted file mode 100644 index 02fa6073291f00df449156a5d57765f91a51939c..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Light.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-LightItalic.otf b/static/src/fonts/FiraSans-LightItalic.otf deleted file mode 100644 index 6ccf6f53d1d1511c0853442524e69bf5106d2745..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-LightItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Medium.otf b/static/src/fonts/FiraSans-Medium.otf deleted file mode 100644 index 4bc55e97baa81169558ea093b305abd7b15fbd1b..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Medium.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-MediumItalic.otf b/static/src/fonts/FiraSans-MediumItalic.otf deleted file mode 100644 index d443b46cdc171fd8fbe34b68a301387a8d7e2079..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-MediumItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Regular.otf b/static/src/fonts/FiraSans-Regular.otf deleted file mode 100644 index fad0098d9eed1bcf8cbde57ecc64ada9a23ca927..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Regular.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-SemiBold.otf b/static/src/fonts/FiraSans-SemiBold.otf deleted file mode 100644 index f077fff93622cb3b07d8faf3644e5595c99bccf9..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-SemiBold.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-SemiBoldItalic.otf b/static/src/fonts/FiraSans-SemiBoldItalic.otf deleted file mode 100644 index 661511a78400d8ac863abf16d20e921658c462a4..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-SemiBoldItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Thin.otf b/static/src/fonts/FiraSans-Thin.otf deleted file mode 100644 index 259686f8e522ccbb89d7d58c02c9f755ffd3a3c2..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Thin.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-ThinItalic.otf b/static/src/fonts/FiraSans-ThinItalic.otf deleted file mode 100644 index 20da974f6976875dbeb282ff225572a73962b504..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-ThinItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Two.otf b/static/src/fonts/FiraSans-Two.otf deleted file mode 100644 index e2c7f6dfe9e05fd94a8ef11aed70b5c6b615f2c7..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Two.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-TwoItalic.otf b/static/src/fonts/FiraSans-TwoItalic.otf deleted file mode 100644 index f62e99ab154949e944f7c80004e1d63c11e01dc6..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-TwoItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-Ultra.otf b/static/src/fonts/FiraSans-Ultra.otf deleted file mode 100644 index c44ed099d99a9b690d5a398138b52d12e6a963a4..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-Ultra.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-UltraItalic.otf b/static/src/fonts/FiraSans-UltraItalic.otf deleted file mode 100644 index c4485141ac12ea79f65f8e69b52ea9121b404c6b..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-UltraItalic.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-UltraLight.otf b/static/src/fonts/FiraSans-UltraLight.otf deleted file mode 100644 index 6328b6f3f225687666b750c243de3221d5375d96..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-UltraLight.otf and /dev/null differ diff --git a/static/src/fonts/FiraSans-UltraLightItalic.otf b/static/src/fonts/FiraSans-UltraLightItalic.otf deleted file mode 100644 index 9aba4e09c17bf1492496a7b8872d99de448acf5c..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FiraSans-UltraLightItalic.otf and /dev/null differ diff --git a/static/src/fonts/FontAwesome.otf b/static/src/fonts/FontAwesome.otf deleted file mode 100644 index 401ec0f36e4f73b8efa40bd6f604fe80d286db70..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/FontAwesome.otf and /dev/null differ diff --git a/static/src/fonts/HELVETICA_COND.ttf b/static/src/fonts/HELVETICA_COND.ttf deleted file mode 100644 index 44096bfa4bbe7751709f9c64321b4683559799e6..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/HELVETICA_COND.ttf and /dev/null differ diff --git a/static/src/fonts/PROPAGANDA.ttf b/static/src/fonts/PROPAGANDA.ttf deleted file mode 100755 index 6fc2b79b615ae47995fd95b847f5855f60864c7b..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/PROPAGANDA.ttf and /dev/null differ diff --git a/static/src/fonts/SIL Open Font License.txt b/static/src/fonts/SIL Open Font License.txt deleted file mode 100644 index 8a1303f86b632ab6e656377271bad3f3733af3fb..0000000000000000000000000000000000000000 --- a/static/src/fonts/SIL Open Font License.txt +++ /dev/null @@ -1,45 +0,0 @@ -Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ with Reserved Font Name Fira Sans. - -Copyright (c) 2014, Telefonica S.A. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the copyright statement(s). - -"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. - -5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/static/src/fonts/fontawesome-webfont.eot b/static/src/fonts/fontawesome-webfont.eot deleted file mode 100644 index e9f60ca953f93e35eab4108bd414bc02ddcf3928..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/fontawesome-webfont.eot and /dev/null differ diff --git a/static/src/fonts/fontawesome-webfont.svg b/static/src/fonts/fontawesome-webfont.svg deleted file mode 100644 index 855c845e538b65548118279537a04eab2ec6ef0d..0000000000000000000000000000000000000000 --- a/static/src/fonts/fontawesome-webfont.svg +++ /dev/null @@ -1,2671 +0,0 @@ - - - - -Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 - By ,,, -Copyright Dave Gandy 2016. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/src/fonts/fontawesome-webfont.ttf b/static/src/fonts/fontawesome-webfont.ttf deleted file mode 100644 index 35acda2fa1196aad98c2adf4378a7611dd713aa3..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/fontawesome-webfont.ttf and /dev/null differ diff --git a/static/src/fonts/fontawesome-webfont.woff b/static/src/fonts/fontawesome-webfont.woff deleted file mode 100644 index 400014a4b06eee3d0c0d54402a47ab2601b2862b..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/fontawesome-webfont.woff and /dev/null differ diff --git a/static/src/fonts/fontawesome-webfont.woff2 b/static/src/fonts/fontawesome-webfont.woff2 deleted file mode 100644 index 4d13fc60404b91e398a37200c4a77b645cfd9586..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/fontawesome-webfont.woff2 and /dev/null differ diff --git a/static/src/fonts/glyphicons-halflings-regular.eot b/static/src/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a4953fff68df523aa7656497ee339d6026d64..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/static/src/fonts/glyphicons-halflings-regular.svg b/static/src/fonts/glyphicons-halflings-regular.svg deleted file mode 100644 index 94fb5490a2ed10b2c69a4a567a4fd2e4f706d841..0000000000000000000000000000000000000000 --- a/static/src/fonts/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/static/src/fonts/glyphicons-halflings-regular.ttf b/static/src/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc609ab6f21774de0cb7e01360095584f65b..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/static/src/fonts/glyphicons-halflings-regular.woff b/static/src/fonts/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e612858f802245ddcbf59788a0db942224bab35..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/static/src/fonts/glyphicons-halflings-regular.woff2 b/static/src/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b54c3751a6d9adb44c8e3a45ba5a73b77f0..0000000000000000000000000000000000000000 Binary files a/static/src/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ diff --git a/static/src/shared/fonts.css b/static/src/shared/fonts.css index f8304e963c05e8f7d3a554d2f5ea5c05572ac599..2a6ae1efa626d3c552ecb1c46cf5ce5d480f07f4 100644 --- a/static/src/shared/fonts.css +++ b/static/src/shared/fonts.css @@ -1,48 +1,15 @@ @font-face { - font-family: 'SansusWebissimoItalic'; - src: url('https://fonts.lqdn.fr/collections/Sansus_Webissimo/SansusWebissimo-Italic.ttf') format('truetype'); + font-family: 'Sansus Webissimo'; + src: url('sansus-webissimo-italic.woff') format('woff'), + url('sansus-webissimo-italic.woff2') format('woff'); font-weight: normal; font-style: italic; } @font-face { - font-family: 'SansusWebissimoRegular'; - src: url('https://fonts.lqdn.fr/collections/Sansus_Webissimo/SansusWebissimo-Regular.ttf') format('truetype'); + font-family: 'Sansus Webissimo'; + src: url('sansus-webissimo-regular.woff') format('woff'), + url('sansus-webissimo-regular.woff2') format('woff2'); font-weight: normal; font-style: normal; } - -@font-face { - font-family: 'FiraSans'; - src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Light.woff2') format('woff2'); - font-weight: 200; - font-style: normal; -} - -@font-face { - font-family: 'FiraSans'; - src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'FiraSans'; - src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Medium.woff2') format('woff2'); - font-weight: 500; - font-style: normal; -} - -@font-face { - font-family: 'FiraSans'; - src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-SemiBold.woff2') format('woff2'); - font-weight: 600; - font-style: normal; -} - -@font-face { - font-family: 'FiraSans'; - src: url('https://fonts.lqdn.fr/collections/Fira_Sans/FiraSans-Book.woff2') format('woff2'); - font-weight: 300; - font-style: normal; -} diff --git a/static/src/shared/sansus-webissimo-italic.woff b/static/src/shared/sansus-webissimo-italic.woff new file mode 100644 index 0000000000000000000000000000000000000000..888d1125e99099818b5996fdc139d559a8f28ad5 Binary files /dev/null and b/static/src/shared/sansus-webissimo-italic.woff differ diff --git a/static/src/shared/sansus-webissimo-italic.woff2 b/static/src/shared/sansus-webissimo-italic.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..610785a76aacc0ba88267f1c022589997e17eb57 Binary files /dev/null and b/static/src/shared/sansus-webissimo-italic.woff2 differ diff --git a/static/src/shared/sansus-webissimo-regular.woff b/static/src/shared/sansus-webissimo-regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..a43e6ddc7b81957db860498d47db5362d0534254 Binary files /dev/null and b/static/src/shared/sansus-webissimo-regular.woff differ diff --git a/static/src/shared/sansus-webissimo-regular.woff2 b/static/src/shared/sansus-webissimo-regular.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..384fe9eeb5c31746ba728a1549086197d70a3557 Binary files /dev/null and b/static/src/shared/sansus-webissimo-regular.woff2 differ diff --git a/static/src/shared/typography.css b/static/src/shared/typography.css index 3915bfe380f7d96594662d859a601c95e1b61e07..ea5b294b7b046f4e8882ba0cbec1f778bd654150 100644 --- a/static/src/shared/typography.css +++ b/static/src/shared/typography.css @@ -1,10 +1,12 @@ +@import "@fontsource/fira-sans"; + html, body { - font-family: FiraSans; + font-family: "Fira Sans", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-size: 16px; } h1, h2 { - font-family: SansusWebissimoRegular; + font-family: 'Sansus Webissimo', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; } h3 { diff --git a/webpack.config.js b/webpack.config.js index 0777211524cbab13e4f189c06f7e3a32eddaff7f..72b62bf06d608f15cd3ce6751cd8930316837270 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -15,8 +15,9 @@ module.exports = { use: [MiniCssExtractPlugin.loader, "css-loader"], }, { - test: /\.(woff|woff2|ttf|eot|svg)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, - use: 'file-loader?name=./fonts/[name]-[hash].[ext]' + test: /\.(woff|woff2|ttf|eot|svg)$/, + use: 'file-loader?name=./fonts/[name]-[hash].[ext]', + include: [path.resolve(__dirname, 'static/src/fonts')], }, ] },