diff --git a/package-lock.json b/package-lock.json index 4aaa28e..e92f434 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,8 @@ "version": "1.7.0", "license": "MIT", "dependencies": { + "@fontsource/inter": "^4.5.4", + "@fontsource/roboto": "^4.5.3", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz", "@tippyjs/react": "^4.2.5", "babel-polyfill": "^6.26.0", @@ -1845,6 +1847,16 @@ "node": ">=4" } }, + "node_modules/@fontsource/inter": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.4.tgz", + "integrity": "sha512-D0icTFpt9bWvB/OEXMztYf0bhUQZoDIYpsco5C7GVfxgKDRl8Jdn3N2aHHQqwjgRUUvRuyMv8HrRM8Hrt4U52w==" + }, + "node_modules/@fontsource/roboto": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.3.tgz", + "integrity": "sha512-NUvBTj332dFRdiVkLlavXbDGoD2zyyeGYmMyrXOnctg/3e4pq95+rJgNfUP+k4v8UBk2L1aomGw9dDjbRdAmTg==" + }, "node_modules/@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", @@ -17139,6 +17151,16 @@ } } }, + "@fontsource/inter": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.4.tgz", + "integrity": "sha512-D0icTFpt9bWvB/OEXMztYf0bhUQZoDIYpsco5C7GVfxgKDRl8Jdn3N2aHHQqwjgRUUvRuyMv8HrRM8Hrt4U52w==" + }, + "@fontsource/roboto": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.3.tgz", + "integrity": "sha512-NUvBTj332dFRdiVkLlavXbDGoD2zyyeGYmMyrXOnctg/3e4pq95+rJgNfUP+k4v8UBk2L1aomGw9dDjbRdAmTg==" + }, "@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", diff --git a/package.json b/package.json index f085b95..ee3c06f 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,8 @@ "author": "Ajay Bura", "license": "MIT", "dependencies": { + "@fontsource/inter": "^4.5.4", + "@fontsource/roboto": "^4.5.3", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz", "@tippyjs/react": "^4.2.5", "babel-polyfill": "^6.26.0", diff --git a/public/fonts/inter/Inter_vf_slant_weight.ttf b/public/fonts/inter/Inter_vf_slant_weight.ttf deleted file mode 100644 index 969a990..0000000 Binary files a/public/fonts/inter/Inter_vf_slant_weight.ttf and /dev/null differ diff --git a/public/fonts/roboto/LICENSE.txt b/public/fonts/roboto/LICENSE.txt deleted file mode 100644 index d645695..0000000 --- a/public/fonts/roboto/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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/public/fonts/roboto/Roboto-Bold.ttf b/public/fonts/roboto/Roboto-Bold.ttf deleted file mode 100644 index 3742457..0000000 Binary files a/public/fonts/roboto/Roboto-Bold.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-BoldItalic.ttf b/public/fonts/roboto/Roboto-BoldItalic.ttf deleted file mode 100644 index e85e7fb..0000000 Binary files a/public/fonts/roboto/Roboto-BoldItalic.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-Italic.ttf b/public/fonts/roboto/Roboto-Italic.ttf deleted file mode 100644 index c9df607..0000000 Binary files a/public/fonts/roboto/Roboto-Italic.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-Light.ttf b/public/fonts/roboto/Roboto-Light.ttf deleted file mode 100644 index 0e97751..0000000 Binary files a/public/fonts/roboto/Roboto-Light.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-LightItalic.ttf b/public/fonts/roboto/Roboto-LightItalic.ttf deleted file mode 100644 index 3ad14fa..0000000 Binary files a/public/fonts/roboto/Roboto-LightItalic.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-Medium.ttf b/public/fonts/roboto/Roboto-Medium.ttf deleted file mode 100644 index e89b0b7..0000000 Binary files a/public/fonts/roboto/Roboto-Medium.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-MediumItalic.ttf b/public/fonts/roboto/Roboto-MediumItalic.ttf deleted file mode 100644 index a5a41d3..0000000 Binary files a/public/fonts/roboto/Roboto-MediumItalic.ttf and /dev/null differ diff --git a/public/fonts/roboto/Roboto-Regular.ttf b/public/fonts/roboto/Roboto-Regular.ttf deleted file mode 100644 index 3d6861b..0000000 Binary files a/public/fonts/roboto/Roboto-Regular.ttf and /dev/null differ diff --git a/src/font-face.css b/src/font-face.css deleted file mode 100644 index 3e9c38c..0000000 --- a/src/font-face.css +++ /dev/null @@ -1,59 +0,0 @@ -/* ---- ROBOTO ---- */ - -@font-face { - font-family: 'Roboto'; - src: url(../public/fonts/roboto/Roboto-Light.ttf); - font-weight: 300; - font-display: swap; -} -@font-face { - font-family: 'Roboto'; - src: url(../public/fonts/roboto/Roboto-Regular.ttf); - font-weight: 400; - font-display: swap; -} -@font-face { - font-family: 'Roboto'; - src: url(../public/fonts/roboto/Roboto-Medium.ttf); - font-weight: 500; - font-display: swap; -} -@font-face { - font-family: 'Roboto'; - src: url(../public/fonts/roboto/Roboto-Bold.ttf); - font-weight: 600; - font-display: swap; -} - -/* ---- Inter ---- */ - -@font-face { - font-family: 'Inter'; - src: url(../public/fonts/inter/Inter_vf_slant_weight.ttf); - font-weight: 300; - font-display: swap; -} -@font-face { - font-family: 'Inter'; - src: url(../public/fonts/inter/Inter_vf_slant_weight.ttf); - font-weight: 350; - font-display: swap; -} -@font-face { - font-family: 'Inter'; - src: url(../public/fonts/inter/Inter_vf_slant_weight.ttf); - font-weight: 400; - font-display: swap; -} -@font-face { - font-family: 'Inter'; - src: url(../public/fonts/inter/Inter_vf_slant_weight.ttf); - font-weight: 500; - font-display: swap; -} -@font-face { - font-family: 'Inter'; - src: url(../public/fonts/inter/Inter_vf_slant_weight.ttf); - font-weight: 600; - font-display: swap; -} \ No newline at end of file diff --git a/src/font.js b/src/font.js new file mode 100644 index 0000000..94b1f47 --- /dev/null +++ b/src/font.js @@ -0,0 +1,5 @@ +import '@fontsource/roboto/300.css'; +import '@fontsource/roboto/400.css'; +import '@fontsource/roboto/500.css'; +import '@fontsource/roboto/700.css'; +import '@fontsource/inter/variable.css'; diff --git a/src/index.jsx b/src/index.jsx index 4dd4f8e..69fff62 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,5 +1,6 @@ import React from 'react'; import ReactDom from 'react-dom'; +import './font'; import './index.scss'; import settings from './client/state/settings'; diff --git a/src/index.scss b/src/index.scss index 9e8833c..a073f7e 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,5 +1,3 @@ -@import url(./font-face.css); - :root { /* background color | --bg-[background type]: value */ @@ -154,7 +152,7 @@ --fw-light: 300; --fw-normal: 400; --fw-medium: 500; - --fw-bold: 600; + --fw-bold: 700; /* spacing | --sp-[space]: value */ @@ -287,7 +285,7 @@ /* override normal font weight for dark mode */ --fw-normal: 350; - --font-secondary: 'Inter', 'Roboto', sans-serif; + --font-secondary: 'InterVariable', 'Roboto', sans-serif; } .dark-theme, diff --git a/webpack.common.js b/webpack.common.js index d764be6..dd45a06 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -39,7 +39,7 @@ module.exports = { use: ['html-loader'], }, { - test: /\.(png|jpe?g|gif|otf|ttf)$/, + test: /\.(png|jpe?g|gif|otf|ttf|woff|woff2)$/, type: 'asset/resource', }, {