diff --git a/app/project.json b/app/project.json index bbd2176a0..e93f66818 100644 --- a/app/project.json +++ b/app/project.json @@ -94,7 +94,6 @@ } ], "styles": [ - "app/src/assets/fonts/OpenSans/OpenSans.css", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css", "projects/aca-content/src/lib/ui/application.scss", @@ -244,7 +243,6 @@ "node_modules/moment/min/moment.min.js" ], "styles": [ - "app/src/assets/fonts/OpenSans/OpenSans.css", "app/src/styles.scss", "projects/aca-content/src/lib/ui/application.scss" ], diff --git a/app/src/assets/fonts/OpenSans/OFL.txt b/app/src/assets/fonts/OpenSans/OFL.txt deleted file mode 100644 index 9b448d401..000000000 --- a/app/src/assets/fonts/OpenSans/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) - -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. diff --git a/app/src/assets/fonts/OpenSans/OpenSans-Bold.ttf b/app/src/assets/fonts/OpenSans/OpenSans-Bold.ttf deleted file mode 100644 index a1398b338..000000000 Binary files a/app/src/assets/fonts/OpenSans/OpenSans-Bold.ttf and /dev/null differ diff --git a/app/src/assets/fonts/OpenSans/OpenSans-ExtraBold.ttf b/app/src/assets/fonts/OpenSans/OpenSans-ExtraBold.ttf deleted file mode 100644 index 08d7185f0..000000000 Binary files a/app/src/assets/fonts/OpenSans/OpenSans-ExtraBold.ttf and /dev/null differ diff --git a/app/src/assets/fonts/OpenSans/OpenSans-Light.ttf b/app/src/assets/fonts/OpenSans/OpenSans-Light.ttf deleted file mode 100644 index d9a9e2772..000000000 Binary files a/app/src/assets/fonts/OpenSans/OpenSans-Light.ttf and /dev/null differ diff --git a/app/src/assets/fonts/OpenSans/OpenSans-Medium.ttf b/app/src/assets/fonts/OpenSans/OpenSans-Medium.ttf deleted file mode 100644 index ba6db9b70..000000000 Binary files a/app/src/assets/fonts/OpenSans/OpenSans-Medium.ttf and /dev/null differ diff --git a/app/src/assets/fonts/OpenSans/OpenSans-Regular.ttf b/app/src/assets/fonts/OpenSans/OpenSans-Regular.ttf deleted file mode 100644 index 1dc226ddc..000000000 Binary files a/app/src/assets/fonts/OpenSans/OpenSans-Regular.ttf and /dev/null differ diff --git a/app/src/assets/fonts/OpenSans/OpenSans-SemiBold.ttf b/app/src/assets/fonts/OpenSans/OpenSans-SemiBold.ttf deleted file mode 100644 index 66acb2075..000000000 Binary files a/app/src/assets/fonts/OpenSans/OpenSans-SemiBold.ttf and /dev/null differ diff --git a/app/src/assets/fonts/OpenSans/OpenSans.css b/app/src/assets/fonts/OpenSans/OpenSans.css deleted file mode 100644 index 40b167dee..000000000 --- a/app/src/assets/fonts/OpenSans/OpenSans.css +++ /dev/null @@ -1,65 +0,0 @@ -/* vietnamese */ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans Regular'), - local('OpenSans-Regular'), - url(OpenSans-Regular.ttf) format('truetype'); - unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; - } - - /* latin-ext */ - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans Regular'), - local('OpenSans-Regular'), - url(OpenSans-Regular.ttf) format('truetype'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; - } - - /* latin */ - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans Regular'), - local('OpenSans-Regular'), - url(OpenSans-Regular.ttf) format('truetype'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; - } - - /* vietnamese */ - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 100; - src: local('Open Sans Light'), - local('OpenSans-Light'), - url(OpenSans-Light.ttf) format('truetype'); - unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; - } - - /* latin-ext */ - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 100; - src: local('Open Sans Light'), - local('OpenSans-Light'), - url(OpenSans-Light.ttf) format('truetype'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; - } - - /* latin */ - @font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 100; - src: local('Open Sans Light'), - local('OpenSans-Light'), - url(OpenSans-Light.ttf) format('truetype'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; - } \ No newline at end of file diff --git a/app/src/styles.scss b/app/src/styles.scss index 394a053f7..c67e4ab3b 100644 --- a/app/src/styles.scss +++ b/app/src/styles.scss @@ -1,6 +1,8 @@ @import 'material-icons/iconfont/material-icons.css'; /* You can add global styles to this file, and also import other style files */ +@import '@fontsource/open-sans'; + body, html { height: 100%; diff --git a/package-lock.json b/package-lock.json index e942160eb..00062df18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,6 +26,7 @@ "@angular/platform-browser": "14.1.3", "@angular/platform-browser-dynamic": "14.1.3", "@angular/router": "14.1.3", + "@fontsource/open-sans": "^5.0.3", "@mat-datetimepicker/core": "^10.1.1", "@mat-datetimepicker/moment": "^10.1.1", "@ngrx/effects": "^14.2.0", @@ -4802,6 +4803,11 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@fontsource/open-sans": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.0.3.tgz", + "integrity": "sha512-L86qrEfW7IWSGojCtiPpw2/M6qKjxDG+EV4k1xMVFCkhh6Z6gyZwevqCt0yOvd1BmjrtUAIAfSzFTjBn3DeZJw==" + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", diff --git a/package.json b/package.json index e173b2276..4dff663ae 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "@angular/platform-browser": "14.1.3", "@angular/platform-browser-dynamic": "14.1.3", "@angular/router": "14.1.3", + "@fontsource/open-sans": "^5.0.3", "@mat-datetimepicker/core": "^10.1.1", "@mat-datetimepicker/moment": "^10.1.1", "@ngrx/effects": "^14.2.0",