diff --git a/app.vue b/app.vue index c5a3b5a..be1f046 100644 --- a/app.vue +++ b/app.vue @@ -28,8 +28,8 @@ const delivery = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'deli const advantages = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'advantages') const roubleSign = new Intl.NumberFormat('ru-RU', { - style: 'currency', - currency: 'RUB', + style: 'currency', + currency: 'RUB', }); const aboutText = computed(() => marked.parse(about?.content || '')) @@ -77,11 +77,10 @@ const { scrollToAnchor, scrollToTop } = useAnchorScroll({
+

{{ about?.title }}

-

{{ about?.title }}

-
diff --git a/assets/Overpass/OFL.txt b/assets/Overpass/OFL.txt new file mode 100644 index 0000000..40284ee --- /dev/null +++ b/assets/Overpass/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2021 The Overpass Project Authors (https://github.com/RedHatOfficial/Overpass) + +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/assets/Overpass/Overpass-Italic-VariableFont_wght.ttf b/assets/Overpass/Overpass-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..a989438 Binary files /dev/null and b/assets/Overpass/Overpass-Italic-VariableFont_wght.ttf differ diff --git a/assets/Overpass/Overpass-VariableFont_wght.ttf b/assets/Overpass/Overpass-VariableFont_wght.ttf new file mode 100644 index 0000000..ea3a5ec Binary files /dev/null and b/assets/Overpass/Overpass-VariableFont_wght.ttf differ diff --git a/assets/Overpass/README.txt b/assets/Overpass/README.txt new file mode 100644 index 0000000..76d2678 --- /dev/null +++ b/assets/Overpass/README.txt @@ -0,0 +1,81 @@ +Overpass Variable Font +====================== + +This download contains Overpass as both variable fonts and static fonts. + +Overpass is a variable font with this axis: + wght + +This means all the styles are contained in these files: + Overpass/Overpass-VariableFont_wght.ttf + Overpass/Overpass-Italic-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Overpass: + Overpass/static/Overpass-Thin.ttf + Overpass/static/Overpass-ExtraLight.ttf + Overpass/static/Overpass-Light.ttf + Overpass/static/Overpass-Regular.ttf + Overpass/static/Overpass-Medium.ttf + Overpass/static/Overpass-SemiBold.ttf + Overpass/static/Overpass-Bold.ttf + Overpass/static/Overpass-ExtraBold.ttf + Overpass/static/Overpass-Black.ttf + Overpass/static/Overpass-ThinItalic.ttf + Overpass/static/Overpass-ExtraLightItalic.ttf + Overpass/static/Overpass-LightItalic.ttf + Overpass/static/Overpass-Italic.ttf + Overpass/static/Overpass-MediumItalic.ttf + Overpass/static/Overpass-SemiBoldItalic.ttf + Overpass/static/Overpass-BoldItalic.ttf + Overpass/static/Overpass-ExtraBoldItalic.ttf + Overpass/static/Overpass-BlackItalic.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/assets/Overpass/static/Overpass-Black.ttf b/assets/Overpass/static/Overpass-Black.ttf new file mode 100644 index 0000000..672c621 Binary files /dev/null and b/assets/Overpass/static/Overpass-Black.ttf differ diff --git a/assets/Overpass/static/Overpass-BlackItalic.ttf b/assets/Overpass/static/Overpass-BlackItalic.ttf new file mode 100644 index 0000000..b290e26 Binary files /dev/null and b/assets/Overpass/static/Overpass-BlackItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-Bold.ttf b/assets/Overpass/static/Overpass-Bold.ttf new file mode 100644 index 0000000..0cd2fb1 Binary files /dev/null and b/assets/Overpass/static/Overpass-Bold.ttf differ diff --git a/assets/Overpass/static/Overpass-BoldItalic.ttf b/assets/Overpass/static/Overpass-BoldItalic.ttf new file mode 100644 index 0000000..15c992d Binary files /dev/null and b/assets/Overpass/static/Overpass-BoldItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-ExtraBold.ttf b/assets/Overpass/static/Overpass-ExtraBold.ttf new file mode 100644 index 0000000..39b8c51 Binary files /dev/null and b/assets/Overpass/static/Overpass-ExtraBold.ttf differ diff --git a/assets/Overpass/static/Overpass-ExtraBoldItalic.ttf b/assets/Overpass/static/Overpass-ExtraBoldItalic.ttf new file mode 100644 index 0000000..2bd7b6e Binary files /dev/null and b/assets/Overpass/static/Overpass-ExtraBoldItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-ExtraLight.ttf b/assets/Overpass/static/Overpass-ExtraLight.ttf new file mode 100644 index 0000000..a8ec220 Binary files /dev/null and b/assets/Overpass/static/Overpass-ExtraLight.ttf differ diff --git a/assets/Overpass/static/Overpass-ExtraLightItalic.ttf b/assets/Overpass/static/Overpass-ExtraLightItalic.ttf new file mode 100644 index 0000000..83f2927 Binary files /dev/null and b/assets/Overpass/static/Overpass-ExtraLightItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-Italic.ttf b/assets/Overpass/static/Overpass-Italic.ttf new file mode 100644 index 0000000..1031a9e Binary files /dev/null and b/assets/Overpass/static/Overpass-Italic.ttf differ diff --git a/assets/Overpass/static/Overpass-Light.ttf b/assets/Overpass/static/Overpass-Light.ttf new file mode 100644 index 0000000..3595a94 Binary files /dev/null and b/assets/Overpass/static/Overpass-Light.ttf differ diff --git a/assets/Overpass/static/Overpass-LightItalic.ttf b/assets/Overpass/static/Overpass-LightItalic.ttf new file mode 100644 index 0000000..d9222cb Binary files /dev/null and b/assets/Overpass/static/Overpass-LightItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-Medium.ttf b/assets/Overpass/static/Overpass-Medium.ttf new file mode 100644 index 0000000..815276f Binary files /dev/null and b/assets/Overpass/static/Overpass-Medium.ttf differ diff --git a/assets/Overpass/static/Overpass-MediumItalic.ttf b/assets/Overpass/static/Overpass-MediumItalic.ttf new file mode 100644 index 0000000..81e1003 Binary files /dev/null and b/assets/Overpass/static/Overpass-MediumItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-Regular.ttf b/assets/Overpass/static/Overpass-Regular.ttf new file mode 100644 index 0000000..b899061 Binary files /dev/null and b/assets/Overpass/static/Overpass-Regular.ttf differ diff --git a/assets/Overpass/static/Overpass-SemiBold.ttf b/assets/Overpass/static/Overpass-SemiBold.ttf new file mode 100644 index 0000000..b8faf9b Binary files /dev/null and b/assets/Overpass/static/Overpass-SemiBold.ttf differ diff --git a/assets/Overpass/static/Overpass-SemiBoldItalic.ttf b/assets/Overpass/static/Overpass-SemiBoldItalic.ttf new file mode 100644 index 0000000..9b29f8e Binary files /dev/null and b/assets/Overpass/static/Overpass-SemiBoldItalic.ttf differ diff --git a/assets/Overpass/static/Overpass-Thin.ttf b/assets/Overpass/static/Overpass-Thin.ttf new file mode 100644 index 0000000..fec42d8 Binary files /dev/null and b/assets/Overpass/static/Overpass-Thin.ttf differ diff --git a/assets/Overpass/static/Overpass-ThinItalic.ttf b/assets/Overpass/static/Overpass-ThinItalic.ttf new file mode 100644 index 0000000..e2d266b Binary files /dev/null and b/assets/Overpass/static/Overpass-ThinItalic.ttf differ diff --git a/assets/Roboto/LICENSE.txt b/assets/Roboto/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/assets/Roboto/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/assets/Roboto/Roboto-Black.ttf b/assets/Roboto/Roboto-Black.ttf new file mode 100644 index 0000000..0112e7d Binary files /dev/null and b/assets/Roboto/Roboto-Black.ttf differ diff --git a/assets/Roboto/Roboto-BlackItalic.ttf b/assets/Roboto/Roboto-BlackItalic.ttf new file mode 100644 index 0000000..b2c6aca Binary files /dev/null and b/assets/Roboto/Roboto-BlackItalic.ttf differ diff --git a/assets/Roboto/Roboto-Bold.ttf b/assets/Roboto/Roboto-Bold.ttf new file mode 100644 index 0000000..43da14d Binary files /dev/null and b/assets/Roboto/Roboto-Bold.ttf differ diff --git a/assets/Roboto/Roboto-BoldItalic.ttf b/assets/Roboto/Roboto-BoldItalic.ttf new file mode 100644 index 0000000..bcfdab4 Binary files /dev/null and b/assets/Roboto/Roboto-BoldItalic.ttf differ diff --git a/assets/Roboto/Roboto-Italic.ttf b/assets/Roboto/Roboto-Italic.ttf new file mode 100644 index 0000000..1b5eaa3 Binary files /dev/null and b/assets/Roboto/Roboto-Italic.ttf differ diff --git a/assets/Roboto/Roboto-Light.ttf b/assets/Roboto/Roboto-Light.ttf new file mode 100644 index 0000000..e7307e7 Binary files /dev/null and b/assets/Roboto/Roboto-Light.ttf differ diff --git a/assets/Roboto/Roboto-LightItalic.ttf b/assets/Roboto/Roboto-LightItalic.ttf new file mode 100644 index 0000000..2d277af Binary files /dev/null and b/assets/Roboto/Roboto-LightItalic.ttf differ diff --git a/assets/Roboto/Roboto-Medium.ttf b/assets/Roboto/Roboto-Medium.ttf new file mode 100644 index 0000000..ac0f908 Binary files /dev/null and b/assets/Roboto/Roboto-Medium.ttf differ diff --git a/assets/Roboto/Roboto-MediumItalic.ttf b/assets/Roboto/Roboto-MediumItalic.ttf new file mode 100644 index 0000000..fc36a47 Binary files /dev/null and b/assets/Roboto/Roboto-MediumItalic.ttf differ diff --git a/assets/Roboto/Roboto-Regular.ttf b/assets/Roboto/Roboto-Regular.ttf new file mode 100644 index 0000000..ddf4bfa Binary files /dev/null and b/assets/Roboto/Roboto-Regular.ttf differ diff --git a/assets/Roboto/Roboto-Thin.ttf b/assets/Roboto/Roboto-Thin.ttf new file mode 100644 index 0000000..2e0dee6 Binary files /dev/null and b/assets/Roboto/Roboto-Thin.ttf differ diff --git a/assets/Roboto/Roboto-ThinItalic.ttf b/assets/Roboto/Roboto-ThinItalic.ttf new file mode 100644 index 0000000..084f9c0 Binary files /dev/null and b/assets/Roboto/Roboto-ThinItalic.ttf differ diff --git a/assets/fonts.scss b/assets/fonts.scss new file mode 100644 index 0000000..a6680f2 --- /dev/null +++ b/assets/fonts.scss @@ -0,0 +1,77 @@ +@mixin font-face($family, $file, $weight: normal, $style: normal) { + @font-face { + font-family: $family; + src: url($file); + font-weight: $weight; + font-style: $style; + } +} + +// assets/Overpass/static/Overpass-ExtraLight.ttf +// assets/Overpass/static/Overpass-ExtraLightItalic.ttf +// assets/Overpass/static/Overpass-Light.ttf +// assets/Overpass/static/Overpass-LightItalic.ttf +// assets/Overpass/static/Overpass-Medium.ttf +// assets/Overpass/static/Overpass-MediumItalic.ttf +// assets/Overpass/static/Overpass-Italic.ttf +// assets/Overpass/static/Overpass-Regular.ttf +// assets/Overpass/static/Overpass-SemiBold.ttf +// assets/Overpass/static/Overpass-SemiBoldItalic.ttf +// assets/Overpass/static/Overpass-Thin.ttf +// assets/Overpass/static/Overpass-ThinItalic.ttf +// assets/Overpass/static/Overpass-Black.ttf +// assets/Overpass/static/Overpass-BlackItalic.ttf +// assets/Overpass/static/Overpass-Bold.ttf +// assets/Overpass/static/Overpass-BoldItalic.ttf +// assets/Overpass/static/Overpass-ExtraBold.ttf +// assets/Overpass/static/Overpass-ExtraBoldItalic.ttf +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Thin.ttf', 100); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-ThinItalic.ttf', 100, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-ExtraLight.ttf', 200); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-ExtraLightItalic.ttf', 200, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Light.ttf', 300); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-LightItalic.ttf', 300, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Regular.ttf', 400); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Italic.ttf', 400, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Medium.ttf', 500); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-MediumItalic.ttf', 500, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-SemiBold.ttf', 600); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-SemiBoldItalic.ttf', 600, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Bold.ttf', 700); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-BoldItalic.ttf', 700, italic); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-Black.ttf', 800); +@include font-face("Overpass", '~/assets/Overpass/static/Overpass-BlackItalic.ttf', 800, italic); + +// assets/Roboto/Roboto-Black.ttf +// assets/Roboto/Roboto-BlackItalic.ttf +// assets/Roboto/Roboto-Bold.ttf +// assets/Roboto/Roboto-BoldItalic.ttf +// assets/Roboto/Roboto-Light.ttf +// assets/Roboto/Roboto-LightItalic.ttf +// assets/Roboto/Roboto-Medium.ttf +// assets/Roboto/Roboto-MediumItalic.ttf +// assets/Roboto/Roboto-Regular.ttf +// assets/Roboto/Roboto-Italic.ttf +// assets/Roboto/Roboto-Thin.ttf +// assets/Roboto/Roboto-ThinItalic.ttf +@include font-face("Roboto", '~/assets/Roboto/Roboto-Black.ttf', 800); +@include font-face("Roboto", '~/assets/Roboto/Roboto-BlackItalic.ttf', 800, italic); +@include font-face("Roboto", '~/assets/Roboto/Roboto-Bold.ttf', 700); +@include font-face("Roboto", '~/assets/Roboto/Roboto-BoldItalic.ttf', 700, italic); +@include font-face("Roboto", '~/assets/Roboto/Roboto-Light.ttf', 300); +@include font-face("Roboto", '~/assets/Roboto/Roboto-LightItalic.ttf', 300, italic); +@include font-face("Roboto", '~/assets/Roboto/Roboto-Medium.ttf', 500); +@include font-face("Roboto", '~/assets/Roboto/Roboto-MediumItalic.ttf', 500, italic); +@include font-face("Roboto", '~/assets/Roboto/Roboto-Regular.ttf', 400); +@include font-face("Roboto", '~/assets/Roboto/Roboto-Italic.ttf', 400, italic); +@include font-face("Roboto", '~/assets/Roboto/Roboto-Thin.ttf', 100); +@include font-face("Roboto", '~/assets/Roboto/Roboto-ThinItalic.ttf', 100, italic); + +// 100 – Thin. +// 200 – Extra Light (Ultra Light) +// 300 – Light. +// 400 – Normal. +// 500 – Medium. +// 600 – Semi Bold (Demi Bold) +// 700 – Bold. +// 800 – Extra Bold (Ultra Bold) \ No newline at end of file diff --git a/assets/main.scss b/assets/main.scss index 8d7fd0f..ab426e4 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -4,6 +4,12 @@ @layer components {} +@import 'fonts.scss'; + +html { + // @apply text-[15px] +} + body { @apply bg-primary-500 select-none min-w-96; } @@ -25,7 +31,7 @@ body { } .logo { - @apply text-orange-400 font-bold w-20 text-xl leading-4 py-4 col-span-4 xl:col-span-2; + @apply text-ioprim font-bold w-20 text-xl leading-4 py-4 col-span-4 xl:col-span-2; } .menu { @@ -88,7 +94,7 @@ a[href^="#"] { } &-title { - @apply text-3xl prose-h1:font-black + @apply col-span-full text-6xl font-black font-h1 leading-[0.85] tracking-tight mb-[3.15rem] } &-image { @@ -125,23 +131,23 @@ a[href^="#"] { } label { - @apply inline-block text-sm font-medium text-gray-900 dark:text-white min-w-36; + @apply inline-block text-sm font-medium text-gray-900 min-w-36; } input { - @apply bg-gray-50 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 disabled:bg-neutral disabled:cursor-not-allowed invalid:border-pink-500 invalid:text-pink-600 focus:invalid:border-pink-500 focus:invalid:ring-pink-500; + @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed invalid:border-pink-500 invalid:text-pink-600 focus:invalid:border-pink-500 focus:invalid:ring-pink-500; } textarea { - @apply block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 max-w-full min-h-10 max-h-40; + @apply block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 max-w-full min-h-10 max-h-40; } button { - @apply rounded-full bg-primary hover:bg-primary-400 transition-colors px-10 py-3 inline-block text-lg font-bold shadow-lg cursor-pointer disabled:opacity-50 disabled:hover:bg-primary; + @apply rounded bg-primary hover:bg-primary-300 transition-colors p-4 inline-block text-2xl font-bold cursor-pointer disabled:opacity-50 disabled:hover:bg-primary leading-4; &.neutral, &[type="reset"] { - @apply bg-neutral hover:bg-neutral-400 + @apply bg-neutral-200 hover:bg-neutral-400 } } @@ -193,6 +199,6 @@ button { } &-name { - @apply text-orange-400 font-bold w-20 text-xl leading-4 col-span-2; + @apply text-ioprim font-bold w-20 text-xl leading-4 col-span-2; } } \ No newline at end of file diff --git a/components/calcModels.vue b/components/calcModels.vue index 3c51c31..d43fc08 100644 --- a/components/calcModels.vue +++ b/components/calcModels.vue @@ -30,7 +30,7 @@ const point = reactive({ })