diff --git a/siteTheme-Bahn-ng/README.adoc b/siteTheme-Bahn-ng/README.adoc index 14472c6..6f0a1b9 100644 --- a/siteTheme-Bahn-ng/README.adoc +++ b/siteTheme-Bahn-ng/README.adoc @@ -44,9 +44,8 @@ The usage of Deutsche Bahn brand and trademarks are bound to clear guidelines an For any usage outside of Deutsche Bahn websites and applications you must remove or replace any Deutsche Bahn brand and design assets as well as protected characteristics and trademarks. -This especially relates to the files in the directories `/src/site/assets/fonts` and `/src/site/assets/images`. +This especially relates to the files in the directory `/src/site/assets/images`. -The fonts in the directory `/src/site/assets/fonts` can only be used in the context of your work at Deutsche Bahn or to fulfill orders and/or services, that are bound to contracts with Deutsche Bahn. Any other usage especially for private purposes or unintended third parties is not allowed. See the https://marketingportal.extranet.deutschebahn.com/marketingportal/Lizenzvereinbarung-ueber-die-Nutzung-der-DB-Type-Schriftenfamilie-9693166[license] for details. === Credits diff --git a/siteTheme-Bahn-ng/site/assets/css/bahn-ng-theme.css b/siteTheme-Bahn-ng/site/assets/css/bahn-ng-theme.css index 563f627..368fb88 100644 --- a/siteTheme-Bahn-ng/site/assets/css/bahn-ng-theme.css +++ b/siteTheme-Bahn-ng/site/assets/css/bahn-ng-theme.css @@ -9,8 +9,8 @@ @font-face { font-family: 'DB Screen Head'; src: local('DB Screen Head Regular'), - url('../fonts/dbscreenhead-regular.woff2') format('woff2'), - url('../fonts/dbscreenhead-regular.woff') format('woff'); + url('https://db-ui.github.io/core/fonts/dbscreenhead-regular.woff2') format('woff2'), + url('https://db-ui.github.io/core/fonts/dbscreenhead-regular.woff') format('woff'); font-weight: 400; font-style: normal; } @@ -18,8 +18,8 @@ @font-face { font-family: 'DB Screen Head'; src: local('DB Screen Head Black'), - url('../fonts/dbscreenhead-black.woff2') format('woff2'), - url('../fonts/dbscreenhead-black.woff') format('woff'); + url('https://db-ui.github.io/core/fonts/dbscreenhead-black.woff2') format('woff2'), + url('https://db-ui.github.io/core/fonts/dbscreenhead-black.woff') format('woff'); font-weight: 700; font-style: normal; } @@ -27,8 +27,8 @@ @font-face { font-family: 'DB Screen Head'; src: local('DB Screen Head Black'), - url('../fonts/dbscreenhead-black.woff2') format('woff2'), - url('../fonts/dbscreenhead-black.woff') format('woff'); + url('https://db-ui.github.io/core/fonts/dbscreenhead-black.woff2') format('woff2'), + url('https://db-ui.github.io/core/fonts/dbscreenhead-black.woff') format('woff'); font-weight: 900; font-style: normal; } diff --git a/siteTheme-Bahn-ng/site/assets/css/micrositemaster.db-ui-core.css b/siteTheme-Bahn-ng/site/assets/css/micrositemaster.db-ui-core.css index b94fba3..a87a65b 100644 --- a/siteTheme-Bahn-ng/site/assets/css/micrositemaster.db-ui-core.css +++ b/siteTheme-Bahn-ng/site/assets/css/micrositemaster.db-ui-core.css @@ -741,19 +741,19 @@ table th { @font-face { font-family: "DB Screen Head"; - src: local("DB Screen Head Light"), url("../fonts/dbscreenhead-light.woff2?4r0073") format("woff2"), url("../fonts/dbscreenhead-light.woff?4r0073") format("woff"); + src: local("DB Screen Head Light"), url("https://db-ui.github.io/core/fonts/dbscreenhead-light.woff2?4r0073") format("woff2"), url("https://db-ui.github.io/core/fonts/dbscreenhead-light.woff?4r0073") format("woff"); font-weight: 300; font-style: normal; } @font-face { font-family: "DB Screen Sans"; - src: local("DB Screen Sans Regular"), url("../fonts/dbscreensans-regular.woff2?4r0073") format("woff2"), url("../fonts/dbscreensans-regular.woff?4r0073") format("woff"); + src: local("DB Screen Sans Regular"), url("https://db-ui.github.io/core/fonts/dbscreensans-regular.woff2?4r0073") format("woff2"), url("https://db-ui.github.io/core/fonts/dbscreensans-regular.woff?4r0073") format("woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "DB Screen Sans"; - src: local("DB Screen Sans Bold"), url("../fonts/dbscreensans-bold.woff2?4r0073") format("woff2"), url("../fonts/dbscreensans-bold.woff?4r0073") format("woff"); + src: local("DB Screen Sans Bold"), url("https://db-ui.github.io/core/fonts/dbscreensans-bold.woff2?4r0073") format("woff2"), url("https://db-ui.github.io/core/fonts/dbscreensans-bold.woff?4r0073") format("woff"); font-weight: 700; font-style: normal; } @@ -762,19 +762,19 @@ table th { font-weight: 400; font-style: normal; font-weight: 300; - src: local("DB Screen Head Light"), url("../fonts/dbscreenhead-light.woff2?4r0073") format("woff2"), url("../fonts/dbscreenhead-light.woff?4r0073") format("woff"); + src: local("DB Screen Head Light"), url("https://db-ui.github.io/core/fonts/dbscreenhead-light.woff2?4r0073") format("woff2"), url("https://db-ui.github.io/core/fonts/dbscreenhead-light.woff?4r0073") format("woff"); } @font-face { font-family: "DB Screen Sans"; font-style: normal; font-weight: 400; - src: local("DB Screen Sans Regular"), url("../fonts/dbscreensans-regular.woff2?4r0073") format("woff2"), url("../fonts/dbscreensans-regular.woff?4r0073") format("woff"); + src: local("DB Screen Sans Regular"), url("https://db-ui.github.io/core/fonts/dbscreensans-regular.woff2?4r0073") format("woff2"), url("https://db-ui.github.io/core/fonts/dbscreensans-regular.woff?4r0073") format("woff"); } @font-face { font-family: "DB Screen Sans"; font-style: normal; font-weight: 700; - src: local("DB Screen Sans Bold"), url("../fonts/dbscreensans-bold.woff2?4r0073") format("woff2"), url("../fonts/dbscreensans-bold.woff?4r0073") format("woff"); + src: local("DB Screen Sans Bold"), url("../fonts/DBNonLatin-Bold-EU.woff2?4r0073") format("woff2"); } :root { --font-family-sans-serif: DB Screen Sans, Helvetica, Arial, sans-serif; diff --git a/siteTheme-Bahn-ng/site/assets/fonts/LICENSE b/siteTheme-Bahn-ng/site/assets/fonts/LICENSE index f1c0714..c82d72e 100644 --- a/siteTheme-Bahn-ng/site/assets/fonts/LICENSE +++ b/siteTheme-Bahn-ng/site/assets/fonts/LICENSE @@ -1,4 +1,94 @@ -Quick summary and translation from the license agreement provided at Deutsche Bahn Marketingportal (https://marketingportal.extranet.deutschebahn.com/marketingportal/Lizenzvereinbarung-ueber-die-Nutzung-der-DB-Type-Schriftenfamilie-9693166): -_You're only allowed to use the font in the context of your work at Deutsche Bahn or to fulfill orders and/or services, that are bound to contracts with Deutsche Bahn. Any other usage especially for private purposes or unintended third parties is strictly prohibited._ +Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts) -Please keep in mind that the "Lizenzvereinbarung über die Nutzung der DB Type Schriftenfamilie" (https://marketingportal.extranet.deutschebahn.com/marketingportal/Lizenzvereinbarung-ueber-die-Nutzung-der-DB-Type-Schriftenfamilie-9693166, german, you need a registration/login) are actually legally binding and this simple and translated excerpt is only giving you a quick hint regarding the whole license agreement; please consult that document for any further license questions and regulations. +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/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-black.woff b/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-black.woff deleted file mode 100644 index f2e9692..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-black.woff and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-black.woff2 b/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-black.woff2 deleted file mode 100644 index 13d7cf0..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-black.woff2 and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-light.woff b/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-light.woff deleted file mode 100644 index f745597..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-light.woff and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-light.woff2 b/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-light.woff2 deleted file mode 100644 index f591e61..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-light.woff2 and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-regular.woff b/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-regular.woff deleted file mode 100644 index 556a54a..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-regular.woff and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-regular.woff2 b/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-regular.woff2 deleted file mode 100644 index fe4e0f0..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreenhead-regular.woff2 and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-bold.woff b/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-bold.woff deleted file mode 100644 index 29ffad6..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-bold.woff and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-bold.woff2 b/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-bold.woff2 deleted file mode 100644 index e486120..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-bold.woff2 and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-regular.woff b/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-regular.woff deleted file mode 100644 index 5afb843..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-regular.woff and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-regular.woff2 b/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-regular.woff2 deleted file mode 100644 index 96d5845..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-regular.woff2 and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-semibold.woff b/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-semibold.woff deleted file mode 100644 index f01a451..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-semibold.woff and /dev/null differ diff --git a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-semibold.woff2 b/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-semibold.woff2 deleted file mode 100644 index 179cfa9..0000000 Binary files a/siteTheme-Bahn-ng/site/assets/fonts/dbscreensans-semibold.woff2 and /dev/null differ