This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch examples/TDJ_localresources in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 33111142d3cb9b5eb948e4c6367055572dffe3b2 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Mar 31 15:43:09 2025 -0700 TourDeJewel: doesn't need Lato font anymore because it comes from JewelTheme --- examples/jewel/TourDeJewel/asconfig.json | 7 +- examples/jewel/TourDeJewel/pom.xml | 5 -- .../main/assembly/third-party/lato/LICENSE-lato | 93 --------------------- .../main/assembly/third-party/lato/Lato-Bold.ttf | Bin 73332 -> 0 bytes .../assembly/third-party/lato/Lato-BoldItalic.ttf | Bin 77732 -> 0 bytes .../main/assembly/third-party/lato/Lato-Italic.ttf | Bin 75792 -> 0 bytes .../assembly/third-party/lato/Lato-Regular.ttf | Bin 75152 -> 0 bytes .../src/main/assembly/third-party/lato/Lato.css | 45 ---------- .../src/main/config/compile-app-config.xml | 7 -- 9 files changed, 1 insertion(+), 156 deletions(-) diff --git a/examples/jewel/TourDeJewel/asconfig.json b/examples/jewel/TourDeJewel/asconfig.json index 1e31114bbb..357efaa9ae 100644 --- a/examples/jewel/TourDeJewel/asconfig.json +++ b/examples/jewel/TourDeJewel/asconfig.json @@ -33,12 +33,7 @@ "additionalOptions": [ "-js-dynamic-access-unknown-members=true", "-js-include-script+=src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js", - "-js-include-css+=src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css", - "-js-include-css+=src/main/assembly/third-party/lato/Lato.css", - "-js-include-asset+=src/main/assembly/third-party/lato/Lato-Regular.ttf", - "-js-include-asset+=src/main/assembly/third-party/lato/Lato-Bold.ttf", - "-js-include-asset+=src/main/assembly/third-party/lato/Lato-Italic.ttf", - "-js-include-asset+=src/main/assembly/third-party/lato/Lato-BoldItalic.ttf" + "-js-include-css+=src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css" ], "files": [ diff --git a/examples/jewel/TourDeJewel/pom.xml b/examples/jewel/TourDeJewel/pom.xml index 20b843c112..2c37fa2c70 100644 --- a/examples/jewel/TourDeJewel/pom.xml +++ b/examples/jewel/TourDeJewel/pom.xml @@ -961,11 +961,6 @@ -source-map=true; -js-include-script+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js; -js-include-css+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css; - -js-include-css+=${basedir}/src/main/assembly/third-party/lato/Lato.css; - -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-Regular.ttf; - -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-Bold.ttf; - -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-Italic.ttf; - -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf; </additionalCompilerOptions> <!-- At command line use -Droyalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven/frameworks --> </configuration> diff --git a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/LICENSE-lato b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/LICENSE-lato deleted file mode 100644 index cb1d5af19a..0000000000 --- a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/LICENSE-lato +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic ([email protected]) with Reserved Font Name "Lato" - -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. diff --git a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Bold.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Bold.ttf deleted file mode 100644 index 016068b486..0000000000 Binary files a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Bold.ttf and /dev/null differ diff --git a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf deleted file mode 100644 index a05d503205..0000000000 Binary files a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf and /dev/null differ diff --git a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Italic.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Italic.ttf deleted file mode 100644 index 0d0f69ea03..0000000000 Binary files a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Italic.ttf and /dev/null differ diff --git a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Regular.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Regular.ttf deleted file mode 100644 index bb2e8875a9..0000000000 Binary files a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Regular.ttf and /dev/null differ diff --git a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato.css b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato.css deleted file mode 100644 index 47e38a9cb0..0000000000 --- a/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato.css +++ /dev/null @@ -1,45 +0,0 @@ -/* -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -*/ - -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: url(../assets/Lato-Regular.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: url(../assets/Lato-Italic.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: url(../assets/Lato-Bold.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: url(../assets/Lato-BoldItalic.ttf) format('truetype'); -} diff --git a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml index 3a8da05cc9..403b775df2 100644 --- a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml +++ b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml @@ -37,12 +37,5 @@ </js-include-script> <js-include-css> <path-element>../assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css</path-element> - <path-element>../assembly/third-party/lato/Lato.css</path-element> </js-include-css> - <js-include-asset> - <path-element>../assembly/third-party/lato/Lato-Regular.ttf</path-element> - <path-element>../assembly/third-party/lato/Lato-Bold.ttf</path-element> - <path-element>../assembly/third-party/lato/Lato-Italic.ttf</path-element> - <path-element>../assembly/third-party/lato/Lato-BoldItalic.ttf</path-element> - </js-include-asset> </royale-config>
