From 08d16dbbeb31ab94a1584b333eae218bf49c9ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Tue, 5 Dec 2023 18:00:21 +0100 Subject: [PATCH] Implement two column layout --- index.html | 1 - public/colors.css | 10 +- public/index.css | 31 +- public/layout.css | 41 -- src/App.svelte | 72 ++- src/App/AppLayout.svelte | 26 + src/App/Footer.svelte | 8 +- src/App/Header.svelte | 29 +- src/App/Header/Authenticate.svelte | 4 +- .../Header/Breadcrumbs/ProjectSegment.svelte | 16 +- src/App/Header/NodeInfo.svelte | 2 +- src/App/MobileFooter.svelte | 93 ++++ src/components/Button.svelte | 116 +++- src/components/ExternalLink.svelte | 12 +- src/components/File.svelte | 16 +- src/components/IconSmall.svelte | 51 +- src/components/InlineMarkdown.svelte | 4 +- src/components/List.svelte | 43 +- src/components/LoadError.svelte | 48 +- src/components/Markdown.svelte | 2 +- src/components/ProjectCard.svelte | 12 +- src/lib/pluralize.ts | 18 - src/modals/ColorPaletteModal.svelte | 2 +- src/views/NotFound.svelte | 7 +- src/views/home/Index.svelte | 117 ++-- src/views/nodes/View.svelte | 124 +++-- src/views/projects/Changeset.svelte | 15 +- src/views/projects/Cob/AssigneeInput.svelte | 3 +- src/views/projects/Cob/CobCommitTeaser.svelte | 6 - src/views/projects/Cob/CobHeader.svelte | 2 - src/views/projects/Cob/LabelInput.svelte | 5 +- src/views/projects/Commit.svelte | 35 +- src/views/projects/Commit/CommitTeaser.svelte | 6 - src/views/projects/Header.svelte | 138 +++-- src/views/projects/Header/SeedButton.svelte | 22 +- src/views/projects/History.svelte | 72 ++- src/views/projects/Issue.svelte | 27 +- src/views/projects/Issue/IssueTeaser.svelte | 3 +- src/views/projects/Issue/New.svelte | 33 +- src/views/projects/Issues.svelte | 179 ++++--- src/views/projects/Layout.svelte | 506 +++++++++++++----- src/views/projects/Patch.svelte | 49 +- src/views/projects/Patch/PatchTeaser.svelte | 8 +- src/views/projects/Patches.svelte | 150 +++--- src/views/projects/Source.svelte | 113 ++-- src/views/projects/Source/Blob.svelte | 18 +- src/views/projects/Source/Header.svelte | 74 ++- src/views/projects/Source/PeerSelector.svelte | 16 +- .../projects/Source/ProjectNameHeader.svelte | 120 +++++ src/views/projects/router.ts | 40 +- src/views/session/Index.svelte | 6 +- tests/e2e/hashRouter.spec.ts | 4 +- tests/e2e/historyRouter.spec.ts | 4 +- tests/e2e/project.spec.ts | 40 +- tests/e2e/project/commit.spec.ts | 15 +- tests/e2e/project/commits.spec.ts | 20 +- tests/e2e/project/issues.spec.ts | 16 +- tests/e2e/project/patch.spec.ts | 4 +- tests/e2e/project/patches.spec.ts | 12 +- tests/e2e/theme.spec.ts | 15 +- tests/support/fixtures.ts | 1 + tests/unit/router.test.ts | 20 - 62 files changed, 1632 insertions(+), 1070 deletions(-) delete mode 100644 public/layout.css create mode 100644 src/App/AppLayout.svelte create mode 100644 src/App/MobileFooter.svelte delete mode 100644 src/lib/pluralize.ts create mode 100644 src/views/projects/Source/ProjectNameHeader.svelte diff --git a/index.html b/index.html index 7a89dc6d3..a19241aa6 100644 --- a/index.html +++ b/index.html @@ -69,7 +69,6 @@ - diff --git a/public/colors.css b/public/colors.css index e08c58f48..46b0d63b0 100644 --- a/public/colors.css +++ b/public/colors.css @@ -37,7 +37,7 @@ --color-fill-danger: #be7495; --color-fill-yellow: #ffe609; --color-fill-yellow-iconic: #ffff55; - --color-fill-gray: #9494b8; + --color-fill-gray: #9b9bb1; --color-fill-diff-red: #efdce4; --color-fill-diff-red-light: #f7eef2; --color-fill-success: #4fa877; @@ -48,6 +48,8 @@ --color-fill-merged: #ffeeff; --color-fill-selected: #ebebff; --color-fill-warning: #ffffe5; + --color-fill-counter: #dbdbff; + --color-fill-counter-emphasized: #dbdbff; } :root[data-theme="dark"] { @@ -86,10 +88,10 @@ --color-fill-separator: #24252d; --color-fill-primary: #ff55ff; --color-fill-primary-hover: #ff80ff; - --color-fill-danger: #4d1929; + --color-fill-danger: #aa5078; --color-fill-yellow: #ffe609; --color-fill-yellow-iconic: #ffff55; - --color-fill-gray: #9494b8; + --color-fill-gray: #9b9bb1; --color-fill-diff-red: #4d1929; --color-fill-diff-red-light: #2d060d; --color-fill-success: #4fa877; @@ -100,4 +102,6 @@ --color-fill-merged: #1a001a; --color-fill-selected: #16173d; --color-fill-warning: #191500; + --color-fill-counter: #393a46; + --color-fill-counter-emphasized: #232563; } diff --git a/public/index.css b/public/index.css index 730c28716..a490fde3c 100644 --- a/public/index.css +++ b/public/index.css @@ -39,12 +39,6 @@ body { scrollbar-color: var(--color-fill-separator) transparent; } -@media (max-width: 720px) { - body { - min-width: 0; - } -} - ::selection { background: var(--color-fill-yellow-iconic); color: var(--color-foreground-black); @@ -89,3 +83,28 @@ pre { font-family: var(--font-family-monospace); font-weight: var(--font-weight-regular); } + +.global-counter { + border-radius: var(--border-radius-tiny); + background-color: var(--color-fill-ghost); + color: var(--color-foreground-dim); + padding: 0 0.25rem; + display: block; + min-width: 1.25rem; + text-align: center; +} + +@media (max-width: 720px) { + body { + min-width: 0; + } + .global-hide-on-mobile { + display: none !important; + } +} + +@media (min-width: 721px) { + .global-hide-on-desktop { + display: none !important; + } +} diff --git a/public/layout.css b/public/layout.css deleted file mode 100644 index 31b358fd7..000000000 --- a/public/layout.css +++ /dev/null @@ -1,41 +0,0 @@ -.layout-centered { - height: 100%; - padding-top: 5rem; - padding-bottom: 24vh; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.layout-mobile, -.layout-mobile-inline, -.layout-mobile-flex { - display: none !important; -} -.layout-desktop { - display: block !important; -} -.layout-desktop-inline { - display: inline !important; -} -.layout-desktop-flex { - display: flex !important; -} - -@media (max-width: 720px) { - .layout-mobile { - display: block !important; - } - .layout-mobile-inline { - display: inline !important; - } - .layout-mobile-flex { - display: flex !important; - } - .layout-desktop, - .layout-desktop-flex, - .layout-desktop-inline { - display: none !important; - } -} diff --git a/src/App.svelte b/src/App.svelte index 98dcf737c..de0dd1138 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -5,9 +5,7 @@ import * as httpd from "@app/lib/httpd"; import { unreachable } from "@app/lib/utils"; - import Footer from "./App/Footer.svelte"; import FullscreenModalPortal from "./App/FullscreenModalPortal.svelte"; - import Header from "./App/Header.svelte"; import Hotkeys from "./App/Hotkeys.svelte"; import LoadingBar from "./App/LoadingBar.svelte"; @@ -42,10 +40,12 @@ @@ -56,40 +56,36 @@ -
-
- {#if $activeRouteStore.resource === "booting"} +{#if $activeRouteStore.resource === "booting"} +
- {:else if $activeRouteStore.resource === "home"} - - {:else if $activeRouteStore.resource === "nodes"} - - {:else if $activeRouteStore.resource === "session"} - - {:else if $activeRouteStore.resource === "project.source"} - - {:else if $activeRouteStore.resource === "project.history"} - - {:else if $activeRouteStore.resource === "project.commit"} - - {:else if $activeRouteStore.resource === "project.issues"} - - {:else if $activeRouteStore.resource === "project.newIssue"} - - {:else if $activeRouteStore.resource === "project.issue"} - - {:else if $activeRouteStore.resource === "project.patches"} - - {:else if $activeRouteStore.resource === "project.patch"} - - {:else if $activeRouteStore.resource === "loadError"} - - {:else if $activeRouteStore.resource === "notFound"} - - {:else} - {unreachable($activeRouteStore)} - {/if} -
-
-
+{:else if $activeRouteStore.resource === "home"} + +{:else if $activeRouteStore.resource === "nodes"} + +{:else if $activeRouteStore.resource === "session"} + +{:else if $activeRouteStore.resource === "project.source"} + +{:else if $activeRouteStore.resource === "project.history"} + +{:else if $activeRouteStore.resource === "project.commit"} + +{:else if $activeRouteStore.resource === "project.issues"} + +{:else if $activeRouteStore.resource === "project.newIssue"} + +{:else if $activeRouteStore.resource === "project.issue"} + +{:else if $activeRouteStore.resource === "project.patches"} + +{:else if $activeRouteStore.resource === "project.patch"} + +{:else if $activeRouteStore.resource === "loadError"} + +{:else if $activeRouteStore.resource === "notFound"} + +{:else} + {unreachable($activeRouteStore)} +{/if} diff --git a/src/App/AppLayout.svelte b/src/App/AppLayout.svelte new file mode 100644 index 000000000..954b9de81 --- /dev/null +++ b/src/App/AppLayout.svelte @@ -0,0 +1,26 @@ + + + + +
+
+ +
+
+
+
+
+ +
+
+
diff --git a/src/App/Footer.svelte b/src/App/Footer.svelte index f5da2df49..3a4b6d0b7 100644 --- a/src/App/Footer.svelte +++ b/src/App/Footer.svelte @@ -45,7 +45,7 @@