From 5ad736a8d8b29b64e1a1d1235ae3ab2c17165f1f Mon Sep 17 00:00:00 2001 From: hannahildebrandt Date: Sun, 26 Jan 2025 22:02:27 -0800 Subject: [PATCH 1/5] Updated the CSS for ProjectPicker, ExplorerView, SceneList, NewSceneField, and Tab --- .vscode/settings.json | 4 +- src/view/explorer/ExplorerView.svelte | 7 ++- src/view/explorer/NewSceneField.svelte | 18 +++--- src/view/explorer/ProjectDetails.svelte | 4 +- src/view/explorer/ProjectPicker.svelte | 41 +++++++++----- src/view/explorer/SceneList.svelte | 28 ++++++++-- src/view/explorer/Tab.svelte | 74 +++++++++++++++++++++++-- 7 files changed, 132 insertions(+), 44 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ad92582..8d9c9bc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "editor.formatOnSave": true -} + "editor.formatOnSave": false +} \ No newline at end of file diff --git a/src/view/explorer/ExplorerView.svelte b/src/view/explorer/ExplorerView.svelte index e92a519..2652a68 100644 --- a/src/view/explorer/ExplorerView.svelte +++ b/src/view/explorer/ExplorerView.svelte @@ -109,11 +109,12 @@ } .tab-list { - margin: var(--size-4-1) 0; - border-bottom: var(--border-width) solid var(--text-muted); + margin: 0; + font-size: 0; /* To remove spacing between tabs */ } .tab-panel-container { - padding: 0; + background: var(--background-primary); + padding: var(--size-4-1) var(--size-4-2); } diff --git a/src/view/explorer/NewSceneField.svelte b/src/view/explorer/NewSceneField.svelte index 27fc366..3268e7a 100644 --- a/src/view/explorer/NewSceneField.svelte +++ b/src/view/explorer/NewSceneField.svelte @@ -38,7 +38,7 @@ { @@ -59,24 +59,20 @@ diff --git a/src/view/explorer/ProjectDetails.svelte b/src/view/explorer/ProjectDetails.svelte index 911c68b..9b9a685 100644 --- a/src/view/explorer/ProjectDetails.svelte +++ b/src/view/explorer/ProjectDetails.svelte @@ -316,10 +316,10 @@ } h4 { - font-weight: bold; + font-size: var(--font-ui-medium); + font-weight: var(--font-semibold); margin: 0; padding: 0; - font-size: 1em; margin-right: var(--size-4-1); } diff --git a/src/view/explorer/ProjectPicker.svelte b/src/view/explorer/ProjectPicker.svelte index c20b08e..ad331df 100644 --- a/src/view/explorer/ProjectPicker.svelte +++ b/src/view/explorer/ProjectPicker.svelte @@ -91,8 +91,8 @@ {/if} {:else}

- To begin, find or create a folder somewhere in your vault in which - you would like to create your novel. Right-click it and select + To begin, find or create a folder somewhere in your vault in which you + would like to create your novel. Right-click it and select Create Longform Project.

{/if} @@ -105,10 +105,11 @@ select { background-color: transparent; - border: none; - padding: 0; - margin: 0; + border: var(--input-border-width) solid var(--background-modifier-border); + border-radius: var(--input-radius); + padding: var(--size-4-2); width: 100%; + height: 100%; font-family: inherit; font-size: 1em; cursor: inherit; @@ -122,19 +123,29 @@ } .select > select { - color: var(--text-accent); + background-color: var(--background-secondary); + color: var(--text-muted); + appearance: auto; } .select > select:hover { - text-decoration: underline; - color: var(--text-accent-hover); + color: var(--text-normal); + box-shadow: 0 0 0 2px var(--background-modifier-border-focus); + border-color: var(--background-modifier-border-focus); + transition: + box-shadow 0.15s ease-in-out, + border 0.15s ease-in-out; } - #project-picker { - display: flex; - flex-direction: row; - align-items: center; - flex-wrap: wrap; + .select select option { + font-size: var(--nav-item-size); + padding: var(--nav-item-padding); + } + + .select select option:checked, + .select select option:hover { + box-shadow: 0 0 10px 100px var(--background-modifier-hover) inset; + color: inherit; } .right-arrow { @@ -150,9 +161,9 @@ } .current-draft-path { - color: var(--text-muted); + color: var(--text-faint); font-size: var(--font-smallest); - padding: 0 0 var(--size-4-1) 0; + padding: 0 0 var(--size-4-1) var(--size-4-3); } .current-draft-path:hover { diff --git a/src/view/explorer/SceneList.svelte b/src/view/explorer/SceneList.svelte index 7c66e39..6fe8222 100644 --- a/src/view/explorer/SceneList.svelte +++ b/src/view/explorer/SceneList.svelte @@ -356,8 +356,8 @@ class="sortable-scene-list" >
selectedTab.set(tab)} > + {#if tab == "Scenes"} + + {/if} + {#if tab == "Project"} + + {/if} + {#if tab == "Compile"} + + {/if} {tab} @@ -17,15 +72,24 @@ background: none; border: none; border-bottom: none; - border-radius: 0; + border-radius: var(--tab-radius-active); + padding: 0 1em 0 0.4em; box-shadow: none; margin: 0; - color: var(--interactive-accent); - font-size: 1em; + color: var(--tab-text-color-focused); + font-size: var(--tab-font-size); + font-weight: var(--tab-font-weight); + white-space: nowrap; + border-right: 1px solid var(--tab-outline-color); + } + + .tab-button:hover { + color: var(--tab-text-color-focused); + background-color: var(--background-modifier-hover); } .tab-button.selected { - border-bottom: var(--size-2-1) solid var(--text-muted); - color: var(--text-accent); + background-color: var(--tab-background-active); + color: var(--tab-text-color-focused-active); } From 84a5486c84d8db827ab61bf06ec4157b93b5288b Mon Sep 17 00:00:00 2001 From: hannahildebrandt Date: Fri, 7 Feb 2025 21:56:36 -0800 Subject: [PATCH 2/5] Project picker and project details --- src/view/components/Disclosure.svelte | 12 ++-- src/view/explorer/ProjectDetails.svelte | 93 +++++++++++++------------ src/view/explorer/ProjectPicker.svelte | 23 +----- 3 files changed, 55 insertions(+), 73 deletions(-) diff --git a/src/view/components/Disclosure.svelte b/src/view/components/Disclosure.svelte index de999e1..18a780c 100644 --- a/src/view/components/Disclosure.svelte +++ b/src/view/components/Disclosure.svelte @@ -5,13 +5,7 @@ - + + \ No newline at end of file diff --git a/src/view/compile/CompileView.svelte b/src/view/compile/CompileView.svelte index 6782d87..b52edca 100644 --- a/src/view/compile/CompileView.svelte +++ b/src/view/compile/CompileView.svelte @@ -348,15 +348,24 @@
{/if} -

- Compile workflows run their steps in order.
Scene workflows - run once per scene.
Join workflows run once and combine the - rest of your scene steps into a single manuscript.
Manuscript - steps run once on the joined manuscript.
Drag to rearrange. - Documentation here. +

  • + Compile workflows run their steps in order. +
  • +
  • + Scene workflows run once per scene. +
  • +
  • + Join workflows run once and combine the rest of your scene steps into a single manuscript. +
  • +
  • + Manuscript steps run once on the joined manuscript. +
  • +
  • + Drag to rearrange. Documentation here. -

    +
  • +
    {#if $currentWorkflow && $currentWorkflow.steps.length > 0} @@ -378,13 +387,16 @@ diff --git a/src/view/explorer/ProjectDetails.svelte b/src/view/explorer/ProjectDetails.svelte index 3d8d191..c39c9ea 100644 --- a/src/view/explorer/ProjectDetails.svelte +++ b/src/view/explorer/ProjectDetails.svelte @@ -299,11 +299,15 @@