diff --git a/public/media/fonts/Roboto_Mono/LICENSE.txt b/public/media/fonts/Roboto_Mono/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/public/media/fonts/Roboto_Mono/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/public/media/fonts/Roboto_Mono/RobotoMono-Italic-VariableFont_wght.ttf b/public/media/fonts/Roboto_Mono/RobotoMono-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..31c87fc Binary files /dev/null and b/public/media/fonts/Roboto_Mono/RobotoMono-Italic-VariableFont_wght.ttf differ diff --git a/public/media/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf b/public/media/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf new file mode 100644 index 0000000..1d5371e Binary files /dev/null and b/public/media/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf differ diff --git a/src/components/applications/file-explorer/FileExplorer.jsx b/src/components/applications/file-explorer/FileExplorer.jsx index 4821805..e8261c9 100644 --- a/src/components/applications/file-explorer/FileExplorer.jsx +++ b/src/components/applications/file-explorer/FileExplorer.jsx @@ -3,9 +3,9 @@ import { useVirtualRoot } from "../../../hooks/virtual-drive/VirtualRootContext. import styles from "./FileExplorer.module.css"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faArrowUp, faCaretLeft, faCaretRight, faCog, faDesktop, faFile, faFileLines, faFolder, faHouse, faImage, faPlus, faSearch } from "@fortawesome/free-solid-svg-icons"; - import { VirtualFile } from "../../../features/virtual-drive/virtual-file.js"; import { useWindowsManager } from "../../../hooks/windows/WindowsManagerContext.js"; +import utilStyles from "../../../styles/utils.module.css"; /** * @param {object} props @@ -97,37 +97,53 @@ export function FileExplorer({ startPath }) {
- - - -
{currentDirectory?.getFiles(showHidden)?.map((file, index) => - )} {currentDirectory?.getSubFolders(showHidden)?.map(({ name }, index) => - diff --git a/src/components/applications/settings/Settings.jsx b/src/components/applications/settings/Settings.jsx index 527720a..3d0d8e8 100644 --- a/src/components/applications/settings/Settings.jsx +++ b/src/components/applications/settings/Settings.jsx @@ -10,6 +10,7 @@ import { StorageManager } from "../../../features/storage/storage.js"; import { round } from "../../../features/math/round.js"; import { Button } from "../../utils/Button.jsx"; import { ProgressBar } from "../../utils/ProgressBar.jsx"; +import utilStyles from "../../../styles/utils.module.css"; /** * @param {object} props @@ -60,12 +61,12 @@ function StorageTab({ virtualRoot }) {

Virtual Drive ({round(maxKB, 1)} KB)

-

{round(usedKB, 1)} KB used - {round(freeKB, 1)} KB free

+

{round(usedKB, 1)} KB used - {round(freeKB, 1)} KB free

Manage data

- diff --git a/src/components/applications/settings/Settings.module.css b/src/components/applications/settings/Settings.module.css index 47eccc0..153b613 100644 --- a/src/components/applications/settings/Settings.module.css +++ b/src/components/applications/settings/Settings.module.css @@ -27,7 +27,7 @@ gap: 0.5rem; align-items: center; width: 100%; - padding: 0.5rem; + padding: 0.75rem; background: none; border: none; border-radius: 0.5rem; @@ -65,10 +65,6 @@ color: var(--foreground-color-a); } -.Option > p { - color: var(--foreground-color-c); -} - .Input { display: flex; gap: 0.5rem; @@ -112,9 +108,6 @@ border: none; border-radius: 0.5rem; outline: none; - font-size: 1rem; - font-weight: 500; - letter-spacing: 0.05rem; transition: background-color 100ms ease-in-out; cursor: pointer; } diff --git a/src/components/applications/text-editor/TextEditor.jsx b/src/components/applications/text-editor/TextEditor.jsx index 944ef69..d7f0df1 100644 --- a/src/components/applications/text-editor/TextEditor.jsx +++ b/src/components/applications/text-editor/TextEditor.jsx @@ -126,7 +126,7 @@ export function TextEditor({ file, setTitle, close, mode }) { /> {currentMode === "view" ?
- {file.extension === "md" + {file?.extension === "md" ? p { +.App-button > p, .App-button > h2 { margin: 0; white-space: nowrap; } \ No newline at end of file diff --git a/src/components/task-bar/menus/HomeMenu.jsx b/src/components/task-bar/menus/HomeMenu.jsx index 3f71214..48506fd 100644 --- a/src/components/task-bar/menus/HomeMenu.jsx +++ b/src/components/task-bar/menus/HomeMenu.jsx @@ -10,6 +10,7 @@ import { useKeyboardListener } from "../../../hooks/utils/keyboard.js"; import { useVirtualRoot } from "../../../hooks/virtual-drive/VirtualRootContext.js"; import { useEffect, useState } from "react"; import Vector2 from "../../../features/math/vector2.js"; +import utilStyles from "../../../styles/utils.module.css"; /** * @param {object} props @@ -93,7 +94,7 @@ export function HomeMenu({ active, setActive, search }) {
-

Apps

+

ProzillaOS

{ApplicationsManager.APPLICATIONS.map(({ name, id }) => )}
diff --git a/src/components/task-bar/menus/HomeMenu.module.css b/src/components/task-bar/menus/HomeMenu.module.css index 1539e5d..8434f08 100644 --- a/src/components/task-bar/menus/HomeMenu.module.css +++ b/src/components/task-bar/menus/HomeMenu.module.css @@ -59,7 +59,7 @@ padding-bottom: 0; } -.Apps h2 { +.Apps > h1 { width: 100%; text-align: left; font-size: 1rem; diff --git a/src/components/windows/Window.jsx b/src/components/windows/Window.jsx index 3b0f6e6..ec20390 100644 --- a/src/components/windows/Window.jsx +++ b/src/components/windows/Window.jsx @@ -8,6 +8,7 @@ import { memo, useEffect, useRef, useState } from "react"; import Application from "../../features/applications/application.js"; import Vector2 from "../../features/math/vector2.js"; import { faWindowMaximize } from "@fortawesome/free-regular-svg-icons"; +import utilStyles from "../../styles/utils.module.css"; /** * @param {object} props @@ -122,7 +123,7 @@ export const Window = memo(function Window({ id, app, size, position, focused = className={styles["Window-icon"]} src={process.env.PUBLIC_URL + `/media/applications/icons/${app.id}.svg`} /> -

{title}

+

{title}

diff --git a/src/components/windows/Window.module.css b/src/components/windows/Window.module.css index 782d460..818de90 100644 --- a/src/components/windows/Window.module.css +++ b/src/components/windows/Window.module.css @@ -18,7 +18,6 @@ box-shadow: calc(var(--shadow-size) * -1) var(--shadow-size) calc(var(--shadow-size) * var(--shadow-spread)) 0px rgba(0, 0, 0, var(--shadow-opacity)); resize: both; overflow: hidden; - /* animation: pop-in 200ms ease-in-out; */ } @keyframes pop-in { diff --git a/src/styles/global.css b/src/styles/global.css index 2d3d8d7..d0ba01c 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -1,3 +1,5 @@ +@import "./global/fonts.css"; + :root { --pink-a: #ff9ff3; --pink-b: #f368e0; @@ -35,59 +37,6 @@ --background-color-d: var(--dark-grey-e); --scrollbar-color: hsla(211, 29%, 40%, 25%); - - --body-font-family: "Poppins", -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; - --mono-font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-Thin.ttf"); - font-weight: 100; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-ExtraLight.ttf"); - font-weight: 200; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-Light.ttf"); - font-weight: 300; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-Regular.ttf"); - font-weight: 400; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-SemiBold.ttf"); - font-weight: 500; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-Bold.ttf"); - font-weight: 600; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-ExtraBold.ttf"); - font-weight: 700; -} - -@font-face { - font-family: "Poppins"; - src: url("/public/media/fonts/Poppins/Poppins-Black.ttf"); - font-weight: 800; } html, body, #root { @@ -119,9 +68,14 @@ p, a, button, input, h1, h2, h3, h4, h5, h6 { letter-spacing: 0.01em; } -code { - font-family: var(--mono-font-family); -} +p, a, div, span { font-size: 1em; } +button, input { font-size: 0.875em; } +h1 { font-size: 2em; } +h2 { font-size: 1.8em; } +h3 { font-size: 1.6em; } +h4 { font-size: 1.4em; } +h5 { font-size: 1.2em; } +h6 { font-size: 1em; } button { margin: 0; @@ -131,6 +85,11 @@ button { cursor: pointer; } +code { + font-family: var(--mono-font-family); +} + + *::selection { color: var(--background-color-c); background-color: var(--grey-b); diff --git a/src/styles/global/fonts.css b/src/styles/global/fonts.css new file mode 100644 index 0000000..96b4fc8 --- /dev/null +++ b/src/styles/global/fonts.css @@ -0,0 +1,59 @@ +:root { + --body-font-family: "Poppins", -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; + --mono-font-family: "Roboto Mono", source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-Thin.ttf"); + font-weight: 100; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-ExtraLight.ttf"); + font-weight: 200; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-Light.ttf"); + font-weight: 300; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-Regular.ttf"); + font-weight: 400; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-SemiBold.ttf"); + font-weight: 500; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-Bold.ttf"); + font-weight: 600; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-ExtraBold.ttf"); + font-weight: 700; +} + +@font-face { + font-family: "Poppins"; + src: url("/public/media/fonts/Poppins/Poppins-Black.ttf"); + font-weight: 800; +} + +@font-face { + font-family: "Roboto Mono"; + src: url("/public/media/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf"); +} \ No newline at end of file diff --git a/src/styles/utils.module.css b/src/styles/utils.module.css new file mode 100644 index 0000000..180c836 --- /dev/null +++ b/src/styles/utils.module.css @@ -0,0 +1,22 @@ +.Text-regular { + font-size: 1em; + font-weight: 400; + letter-spacing: 0.01em; +} + +.Text-light { + color: var(--foreground-color-c); + font-size: 0.875em; + font-weight: 300; + letter-spacing: 0.025em; +} + +.Text-semibold { + font-weight: 500; + letter-spacing: 0.025em; +} + +.Text-bold { + font-weight: 600; + letter-spacing: 0.05em; +} \ No newline at end of file