diff --git a/src/app.css b/src/app.css index ec2d25c..d6f069e 100644 --- a/src/app.css +++ b/src/app.css @@ -1,19 +1,19 @@ @font-face { - font-family: "Roboto"; + font-family: "Inter"; font-weight: 600; - src: url("font/Roboto-Bold.ttf"); + src: url("font/Inter-Bold.ttf"); } @font-face { - font-family: "Roboto"; + font-family: "Inter"; font-weight: 500; - src: url("font/Roboto-Medium.ttf"); + src: url("font/Inter-Medium.ttf"); } @font-face { - font-family: "Roboto"; + font-family: "Inter"; font-weight: 400; - src: url("font/Roboto-Regular.ttf"); + src: url("font/Inter-Regular.ttf"); } * { @@ -29,7 +29,7 @@ body { background: transparent; - font-family: "Roboto", sans-serif; + font-family: "Inter", sans-serif; font-weight: 400; font-size: 14px; user-select: none; diff --git a/src/font/Inter-Bold.ttf b/src/font/Inter-Bold.ttf new file mode 100644 index 0000000..ecc7041 Binary files /dev/null and b/src/font/Inter-Bold.ttf differ diff --git a/src/font/Inter-Medium.ttf b/src/font/Inter-Medium.ttf new file mode 100644 index 0000000..a01f377 Binary files /dev/null and b/src/font/Inter-Medium.ttf differ diff --git a/src/font/Inter-Regular.ttf b/src/font/Inter-Regular.ttf new file mode 100644 index 0000000..5e4851f Binary files /dev/null and b/src/font/Inter-Regular.ttf differ diff --git a/src/font/OFL.txt b/src/font/OFL.txt new file mode 100644 index 0000000..b525cbf --- /dev/null +++ b/src/font/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter) + +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/src/font/Roboto-Bold.ttf b/src/font/Roboto-Bold.ttf deleted file mode 100644 index 43da14d..0000000 Binary files a/src/font/Roboto-Bold.ttf and /dev/null differ diff --git a/src/font/Roboto-Medium.ttf b/src/font/Roboto-Medium.ttf deleted file mode 100644 index ac0f908..0000000 Binary files a/src/font/Roboto-Medium.ttf and /dev/null differ diff --git a/src/font/Roboto-Regular.ttf b/src/font/Roboto-Regular.ttf deleted file mode 100644 index ddf4bfa..0000000 Binary files a/src/font/Roboto-Regular.ttf and /dev/null differ diff --git a/src/lib/login/loginmodal/ModalButton.svelte b/src/lib/login/loginmodal/ModalButton.svelte index 6b68ecb..963e62a 100644 --- a/src/lib/login/loginmodal/ModalButton.svelte +++ b/src/lib/login/loginmodal/ModalButton.svelte @@ -14,7 +14,7 @@ .button { background-color: rgba(0, 0, 0, .26); border: none; - font-family: "Roboto", sans-serif; + font-family: "Inter", sans-serif; padding: 20px; color: white; font-size: 16px; diff --git a/src/lib/login/loginmodal/ModalInput.svelte b/src/lib/login/loginmodal/ModalInput.svelte index 70ecb09..afe68ff 100644 --- a/src/lib/login/loginmodal/ModalInput.svelte +++ b/src/lib/login/loginmodal/ModalInput.svelte @@ -37,7 +37,7 @@ background-color: transparent; border: none; font-size: 16px; - font-family: "Roboto", sans-serif; + font-family: "Inter", sans-serif; color: white; } \ No newline at end of file diff --git a/src/lib/main/ButtonLaunchArea.svelte b/src/lib/main/ButtonLaunchArea.svelte index 5631305..edfd37b 100644 --- a/src/lib/main/ButtonLaunchArea.svelte +++ b/src/lib/main/ButtonLaunchArea.svelte @@ -21,7 +21,7 @@ display: block; padding: 16px; transition: background-color ease .2s; - font-family: "Roboto", sans-serif; + font-family: "Inter", sans-serif; cursor: pointer; width: 100%; font-weight: 600; diff --git a/src/lib/main/ButtonVersion.svelte b/src/lib/main/ButtonVersion.svelte index 05a95f7..8b9081f 100644 --- a/src/lib/main/ButtonVersion.svelte +++ b/src/lib/main/ButtonVersion.svelte @@ -3,7 +3,7 @@ export let icon; export let title; - export let date; + export let subtitle; const dispatch = createEventDispatcher(); @@ -11,7 +11,7 @@ \ No newline at end of file diff --git a/src/lib/settings/SelectSetting.svelte b/src/lib/settings/SelectSetting.svelte index f1ecc64..454eacd 100644 --- a/src/lib/settings/SelectSetting.svelte +++ b/src/lib/settings/SelectSetting.svelte @@ -24,7 +24,7 @@ border: none; border-bottom: solid 1px #4677FF; color: white; - font-family: "Roboto", sans-serif; + font-family: "Inter", sans-serif; padding: 5px; border-radius: 3px; cursor: pointer; diff --git a/src/lib/settings/TextSetting.svelte b/src/lib/settings/TextSetting.svelte index 756ce17..77cc0af 100644 --- a/src/lib/settings/TextSetting.svelte +++ b/src/lib/settings/TextSetting.svelte @@ -21,7 +21,7 @@ border: none; border-bottom: solid 1px #4677FF; color: white; - font-family: "Roboto", sans-serif; + font-family: "Inter", sans-serif; padding: 5px; border-radius: 3px; }