diff --git a/res/static/style/layout.css b/res/static/style/layout.css index b23ed96..192e1d2 100644 --- a/res/static/style/layout.css +++ b/res/static/style/layout.css @@ -393,10 +393,6 @@ table:not(.form) { min-width: 100%; } -tr { - border-bottom: 1px var(--separator) solid; -} - tr>td { padding: 0.2em 0.5em; } diff --git a/svelte/src/filesystem/Filesystem.svelte b/svelte/src/filesystem/Filesystem.svelte index d8887c2..3dc812e 100644 --- a/svelte/src/filesystem/Filesystem.svelte +++ b/svelte/src/filesystem/Filesystem.svelte @@ -47,13 +47,16 @@ onMount(() => { return } - // Custom CSS rules for the whole viewer - document.documentElement.style = css_from_path(nav.path) + // Custom CSS rules for the whole viewer. The MainMenu applies its + // styles to the element. So we apply to the element, our + // styles take precedence since they're lower level, and we can clean it + // up afterwards without overwriting global style + document.body.style = css_from_path(nav.path) }) return () => { page_sub() nav_sub() - document.documentElement.style = "" + document.body.style = "" } }) diff --git a/svelte/src/user_home/dashboard/Dashboard.svelte b/svelte/src/user_home/dashboard/Dashboard.svelte index 79d3730..0793f3b 100644 --- a/svelte/src/user_home/dashboard/Dashboard.svelte +++ b/svelte/src/user_home/dashboard/Dashboard.svelte @@ -185,7 +185,7 @@ onMount(() => { max-width: 100%; background: var(--body_background); border-radius: 8px; - padding: 2px; + border: 1px solid var(--separator); text-align: initial; } .card_component { diff --git a/svelte/src/util/Modal.svelte b/svelte/src/util/Modal.svelte index da9d89b..caba000 100644 --- a/svelte/src/util/Modal.svelte +++ b/svelte/src/util/Modal.svelte @@ -135,6 +135,7 @@ these padding divs to move it 25% up */ border-radius: 18px 18px 8px 8px; overflow: hidden; text-align: left; + border: 1px solid var(--separator); } .header { flex-grow: 0; diff --git a/svelte/src/wrap/MainMenu.svelte b/svelte/src/wrap/MainMenu.svelte index 560737f..3cd9eb7 100644 --- a/svelte/src/wrap/MainMenu.svelte +++ b/svelte/src/wrap/MainMenu.svelte @@ -20,10 +20,10 @@ const toggle_menu = (e: MouseEvent) => { menu_collapsed = !menu_collapsed } -onMount(async () => { +onMount(() => { menu_collapsed = document.documentElement.clientWidth < 1000 - await loading_run(async () => { + loading_run(async () => { const user = await get_user() if (user.username === undefined || user.username === "") { return diff --git a/svelte/src/wrap/Tree.svelte b/svelte/src/wrap/Tree.svelte index cc45146..b954fe6 100644 --- a/svelte/src/wrap/Tree.svelte +++ b/svelte/src/wrap/Tree.svelte @@ -15,56 +15,52 @@ onMount(() => { }) -{#if $global_navigator.path.length > 1} - - {#snippet title()} -
Parent directories
- - {/snippet} - - {#snippet body()} - {#each $global_navigator.path.slice(0, $global_navigator.path.length-1) as node (node.id)} - {#if node.type === "dir"} -
- - {node.name} - {node.name} - -
- {/if} - {/each} - {/snippet} -
-{/if} - -{#if siblings.length !== 0} - - {#snippet title()} -
Siblings
- - - {/snippet} + {/snippet} - {#snippet body()} - {#each siblings as node (node.id)} - {#if !node.is_hidden()} -
- - {node.name} - {node.name} - -
- {/if} - {/each} - {/snippet} -
-{/if} + {#snippet body()} + {#each $global_navigator.path.slice(0, $global_navigator.path.length-1) as node (node.id)} + {#if node.type === "dir"} +
+ + {node.name} + {node.name} + +
+ {/if} + {/each} + {/snippet} + + + + {#snippet title()} +
Siblings
+ + + {/snippet} + + {#snippet body()} + {#each siblings as node (node.id)} + {#if !node.is_hidden()} +
+ + {node.name} + {node.name} + +
+ {/if} + {/each} + {/snippet} +