diff --git a/public/fonts/JetBrainsMono-Bold.ttf b/public/fonts/JetBrainsMono-Bold.ttf new file mode 100644 index 000000000..0a9280916 Binary files /dev/null and b/public/fonts/JetBrainsMono-Bold.ttf differ diff --git a/public/fonts/JetBrainsMono-BoldItalic.ttf b/public/fonts/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 000000000..d051920c1 Binary files /dev/null and b/public/fonts/JetBrainsMono-BoldItalic.ttf differ diff --git a/public/fonts/JetBrainsMono-Italic.ttf b/public/fonts/JetBrainsMono-Italic.ttf new file mode 100644 index 000000000..e54a46ee9 Binary files /dev/null and b/public/fonts/JetBrainsMono-Italic.ttf differ diff --git a/public/fonts/JetBrainsMono-Regular.ttf b/public/fonts/JetBrainsMono-Regular.ttf new file mode 100644 index 000000000..8da8aa405 Binary files /dev/null and b/public/fonts/JetBrainsMono-Regular.ttf differ diff --git a/public/fonts/JetBrainsMono-SemiBold.ttf b/public/fonts/JetBrainsMono-SemiBold.ttf new file mode 100644 index 000000000..94c1b18c2 Binary files /dev/null and b/public/fonts/JetBrainsMono-SemiBold.ttf differ diff --git a/public/fonts/JetBrainsMono-SemiBoldItalic.ttf b/public/fonts/JetBrainsMono-SemiBoldItalic.ttf new file mode 100644 index 000000000..51d8fdd2e Binary files /dev/null and b/public/fonts/JetBrainsMono-SemiBoldItalic.ttf differ diff --git a/public/typography.css b/public/typography.css index 4089c3c2a..6b3ad54c7 100644 --- a/public/typography.css +++ b/public/typography.css @@ -20,6 +20,52 @@ src: url("fonts/Inter-Bold.otf"); } +@font-face { + font-family: "JetBrains Mono"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url("fonts/JetBrainsMono-Regular.ttf"); +} + +@font-face { + font-family: "JetBrains Mono"; + font-weight: 600; + font-display: swap; + src: url("fonts/JetBrainsMono-SemiBold.ttf"); +} + +@font-face { + font-family: "JetBrains Mono"; + font-weight: 700; + font-display: swap; + src: url("fonts/JetBrainsMono-Bold.ttf"); +} + +@font-face { + font-family: "JetBrains Mono"; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url("fonts/JetBrainsMono-Italic.ttf"); +} + +@font-face { + font-family: "JetBrains Mono"; + font-style: italic; + font-weight: 600; + font-display: swap; + src: url("fonts/JetBrainsMono-SemiBoldItalic.ttf"); +} + +@font-face { + font-family: "JetBrains Mono"; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url("fonts/JetBrainsMono-BoldItalic.ttf"); +} + :root { --font-family-sans-serif: Inter, sans-serif; --font-family-monospace: monospace; @@ -34,6 +80,14 @@ --font-size-huge: 2rem; } +[data-codefont="system"] { + --font-family-monospace: monospace; +} + +[data-codefont="jetbrains"] { + --font-family-monospace: "JetBrains Mono"; +} + html { -ms-text-size-adjust: 100%; -webkit-font-smoothing: antialiased; diff --git a/src/Header.svelte b/src/Header.svelte index 4c1dd9fa7..d803e3244 100644 --- a/src/Header.svelte +++ b/src/Header.svelte @@ -14,7 +14,7 @@ import Search from "@app/Search.svelte"; import SearchResults from "@app/components/Modal/SearchResults.svelte"; import SeedDropdown from "@app/SeedDropdown.svelte"; - import ThemeToggle from "@app/ThemeToggle.svelte"; + import SettingsDropdown from "@app/components/SettingsDropdown.svelte"; import { Profile, ProfileType } from "@app/profile"; import { closeFocused } from "@app/Floating.svelte"; @@ -119,6 +119,7 @@ .modal { background: var(--color-background); border-radius: var(--border-radius); + box-shadow: var(--elevation-low); max-width: 22.5rem; min-width: 18rem; padding: 1.5rem; @@ -127,12 +128,26 @@ top: 5rem; } .modal-register { - color: var(--color-foreground-6); + color: var(--color-foreground); padding-left: 0.5rem; } .modal-register:hover { color: var(--color-foreground); } + + .toggle { + width: 2.5rem; + height: 2.5rem; + border-radius: var(--border-radius-round); + border: 1px solid var(--color-foreground); + display: flex; + justify-content: center; + align-items: center; + } + .toggle:hover { + background-color: var(--color-foreground); + color: var(--color-background); + }
@@ -217,9 +232,14 @@ {/if} - + +
+ +
+ +
- +
diff --git a/src/Icon.svelte b/src/Icon.svelte index 67e6231a2..cc1f4000a 100644 --- a/src/Icon.svelte +++ b/src/Icon.svelte @@ -9,8 +9,12 @@ | "fork" | "github" | "moon" + | "checkmark" | "sun" | "twitter" + | "gear" + | "chevron-down" + | "chevron-up" | "url"; @@ -70,6 +74,91 @@ + {:else if name === "chevron-down"} + + {:else if name === "chevron-up"} + + {:else if name === "gear"} + {:else if name === "fork"} + {:else if name === "checkmark"} + {:else if name === "sun"} import Icon from "@app/Icon.svelte"; + import Toggle from "@app/Toggle.svelte"; $: document.documentElement.setAttribute("data-theme", $theme); - -
{ - theme.set($theme === "dark" ? "light" : "dark"); - storeTheme($theme); - }}> - {#if $theme === "dark"} - - {:else} - - {/if} +
+ theme.set("light")} /> + { + theme.set($theme === "dark" ? "light" : "dark"); + storeTheme($theme); + }} /> + theme.set("dark")} />
diff --git a/src/Toggle.svelte b/src/Toggle.svelte new file mode 100644 index 000000000..b7299f004 --- /dev/null +++ b/src/Toggle.svelte @@ -0,0 +1,55 @@ + + + + +
+ +
diff --git a/src/appearance.ts b/src/appearance.ts new file mode 100644 index 000000000..9cddb711b --- /dev/null +++ b/src/appearance.ts @@ -0,0 +1,31 @@ +import { writable } from "svelte/store"; + +export type CodeFont = "jetbrains" | "system"; +export const codeFont = writable(loadCodeFont()); + +export function storeCodeFont(codeFont: CodeFont): void { + window.localStorage.setItem("codefont", codeFont); +} + +function loadCodeFont(): CodeFont { + const storedCodeFont = window.localStorage.getItem("codefont"); + + if (storedCodeFont === null) { + return "system"; + } else { + return storedCodeFont as CodeFont; + } +} + +export const codeFonts: { + storedName: CodeFont; + fontFamily: string; + displayName: string; +}[] = [ + { + storedName: "jetbrains", + fontFamily: "JetBrains Mono", + displayName: "JetBrains Mono", + }, + { storedName: "system", fontFamily: "monospace", displayName: "system" }, +]; diff --git a/src/base/projects/Blob.svelte b/src/base/projects/Blob.svelte index e564c4bad..3d8d3a46d 100644 --- a/src/base/projects/Blob.svelte +++ b/src/base/projects/Blob.svelte @@ -233,7 +233,7 @@ {#if blob.html}
{@html blob.content}
{:else} -
{blob.content}
+
{blob.content}
{/if} {/if}
diff --git a/src/components/SettingsDropdown.svelte b/src/components/SettingsDropdown.svelte new file mode 100644 index 000000000..08e6eff2b --- /dev/null +++ b/src/components/SettingsDropdown.svelte @@ -0,0 +1,118 @@ + + + + +