diff --git a/angular.json b/angular.json index f81fadf..e38dc1a 100644 --- a/angular.json +++ b/angular.json @@ -43,8 +43,8 @@ "styles":[ "node_modules/bootstrap/scss/bootstrap.scss", "node_modules/bootstrap-icons/font/bootstrap-icons.css", - "src/assets/css/overrides.css", "src/assets/css/styles.css", + "src/assets/css/overrides.css" "src/assets/css/ace-overrides.css" ], "scripts":[ diff --git a/package.json b/package.json index f57be40..69555a0 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,10 @@ "maintainer": "ITDominator" } }, - "postinstall": "electron-builder install-app-deps", + "overrides": { + "glob": "9.0.0", + "rimraf": "4.3.1" + }, "dependencies": { "ace-diff": "3.0.3", "ace-layout": "1.5.0", @@ -75,7 +78,7 @@ "concurrently": "9.1.2", "electron": "36.2.0", "@electron/remote": "2.1.2", - "electron-builder": "26.0.12", + "electron-builder": "22.7.0", "jasmine-core": "5.6.0", "jimp": "1.6.0", "karma": "6.4.0", diff --git a/src/assets/css/overrides.css b/src/assets/css/overrides.css index 3226bf1..0ed615a 100644 --- a/src/assets/css/overrides.css +++ b/src/assets/css/overrides.css @@ -1,31 +1,4 @@ -/* FONTS */ -@font-face { - font-family: "JetBrainsMono-Regular"; - src: url("../fonts/JetBrainsMono-Regular.woff2") format('woff'); -} - -@font-face { - font-family: "JetBrainsMono-Light"; - src: url("../fonts/JetBrainsMono-Light.woff2") format('woff'); - font-weight: bold; -} - -@font-face { - font-family: "SourceCodePro-Regular"; - src: url("../fonts/SourceCodePro-Regular.ttf"); -} - -@font-face { - font-family: "SourceCodePro-Light"; - src: url("../fonts/SourceCodePro-Light.ttf"); - font-weight: bold; -} - - /* TAGS */ -* { - font-family: "SourceCodePro-Light" !important; -} html { background-color: rgba(40, 44, 52, 0.64); diff --git a/src/assets/fonts/JetBrainsMono-2.304-OFL.txt b/src/assets/fonts/JetBrainsMono-2.304-OFL.txt deleted file mode 100644 index 8bee414..0000000 --- a/src/assets/fonts/JetBrainsMono-2.304-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) - -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: -https://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/src/assets/fonts/JetBrainsMono-Light.woff2 b/src/assets/fonts/JetBrainsMono-Light.woff2 deleted file mode 100644 index 6538498..0000000 Binary files a/src/assets/fonts/JetBrainsMono-Light.woff2 and /dev/null differ diff --git a/src/assets/fonts/JetBrainsMono-Regular.woff2 b/src/assets/fonts/JetBrainsMono-Regular.woff2 deleted file mode 100644 index 40da427..0000000 Binary files a/src/assets/fonts/JetBrainsMono-Regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/SourceCodePro-Light.ttf b/src/assets/fonts/SourceCodePro-Light.ttf deleted file mode 100644 index 7506643..0000000 Binary files a/src/assets/fonts/SourceCodePro-Light.ttf and /dev/null differ diff --git a/src/assets/fonts/SourceCodePro-Regular.ttf b/src/assets/fonts/SourceCodePro-Regular.ttf deleted file mode 100644 index fd02539..0000000 Binary files a/src/assets/fonts/SourceCodePro-Regular.ttf and /dev/null differ diff --git a/src/assets/fonts/Source_Code_Pro-OFL.txt b/src/assets/fonts/Source_Code_Pro-OFL.txt deleted file mode 100644 index 54da4a4..0000000 --- a/src/assets/fonts/Source_Code_Pro-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. - -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: -https://openfontlicense.org - - ------------------------------------------------------------ -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.