Adjust formatting of jest

[rbdr/forum] / src / routes / __layout.svelte

diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 234d26ac0d7ae32dffe7d78ba4156c1d40079c12..007781075796fd16a0ca4aba114d78676e6ebc56 100644 (file)
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,16 +1,17 @@
-<script>
-       import '$/config/i18n';
+<script lang="ts">
+       import '../app.css';
+       import '$lib/i18n';
 
        import { isLoading } from 'svelte-i18n';
        import { _ } from 'svelte-i18n';
 
-       import { getForums } from '$/stores/forums';
+       import { getForums } from '$lib/stores/forums';
 
-       import ErrorBlock from '$/components/error_block/error_block.svelte';
-       import ForumList from '$/components/forum_list/forum_list.svelte';
-       import Header from '$/components/header/header.svelte';
-       import Loader from '$/components/loader/loader.svelte';
-       import Footer from '$/components/footer/footer.svelte';
+       import ErrorBlock from '$lib/components/error_block/error_block.svelte';
+       import ForumList from '$lib/components/forum_list/forum_list.svelte';
+       import Header from '$lib/components/header/header.svelte';
+       import Loader from '$lib/components/loader/loader.svelte';
+       import Footer from '$lib/components/footer/footer.svelte';
 
        $: store = getForums();
        $: forums = $store.data;
@@ -20,27 +21,22 @@
        <Loader />
 {:else}
        <Header />
-       <main>
+       <main class="col-start-2 col-span-11">
                <slot />
        </main>
-  <nav title={$_('forum_list.title')}>
-    {#if $store.loading}
-      <Loader />
-    {/if}
-    {#if $store.error}
-      <ErrorBlock message={$_('forum_list.error.unavailable')} />
-    {/if}
-    {#if forums}
-      <ForumList forums={forums} />
-    {/if}
-  </nav>
+       <nav
+               class="col-start-1 row-start-2 border-r-2 border-2-black border-solid"
+               title={$_('forum_list.title')}
+       >
+               {#if $store.loading}
+                       <Loader />
+               {/if}
+               {#if $store.error}
+                       <ErrorBlock message={$_('forum_list.error.unavailable')} />
+               {/if}
+               {#if forums}
+                       <ForumList {forums} />
+               {/if}
+       </nav>
        <Footer />
 {/if}
-
-<style>
-       nav {
-               grid-column: col-start 1;
-               grid-row: 2;
-               border-right: 1px solid black;
-       }
-</style>