Skip to content

Commit 7ad8d53

Browse files
committed
breadcrumb + navbar edits
1 parent 1a472f2 commit 7ad8d53

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

src/lib/components/Header.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { Link, OutboundLink } from 'carbon-components-svelte';
44
</script>
55

6-
<header>
6+
<header class="sticky top-0 z-50">
77
<div class="mb-10 bg-slate-900 px-4 py-2 md:px-8 lg:px-36">
88
<nav class="flex flex-row flex-wrap gap-2 md:gap-8">
99
<Link class="pr-2 text-xs !text-white" href={base}>M/S Reading Room v1</Link>

src/lib/components/SearchTabs.svelte

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,3 @@
4343
</TabContent>
4444
</svelte:fragment>
4545
</Tabs>
46-
47-
<!-- <div>
48-
<ul>
49-
{#each results as result}
50-
<li>{result}</li>
51-
{/each}
52-
</ul>
53-
</div> -->

src/lib/scope.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@ export function getScopeIndex(scope) {
88

99
export function updateScopeIndex(index) {
1010
const newScope = validScopes[index];
11-
goto(`?tab=${newScope}`, { replaceState: true, invalidateAll: true });
11+
goto(`?tab=${newScope}`, {
12+
replaceState: true,
13+
invalidateAll: true,
14+
noScroll: false,
15+
keepFocus: true
16+
});
1217
}

src/routes/+layout.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<div class="min-h-screen">
2929
<Header />
30-
<main class="mb-36 w-full px-4 pb-20 md:px-8 lg:px-36">
30+
<main class="relative mb-36 w-full px-4 pb-20 md:px-8 lg:px-36">
3131
{@render children()}
3232
</main>
3333
</div>

src/routes/about/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
];
9191
</script>
9292

93-
<Breadcrumb noTrailingSlash class="mb-8">
93+
<Breadcrumb class="mb-8">
9494
<BreadcrumbItem href={base}>Home</BreadcrumbItem>
9595
</Breadcrumb>
9696

src/routes/data-guide/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
};
3131
</script>
3232

33-
<Breadcrumb noTrailingSlash class="mb-8">
33+
<Breadcrumb class="mb-8">
3434
<BreadcrumbItem href={base}>Home</BreadcrumbItem>
3535
</Breadcrumb>
3636

src/routes/results/[scope]/+page.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
}
8787
</script>
8888
89-
<Breadcrumb noTrailingSlash class="mb-8">
89+
<Breadcrumb class="mb-8">
9090
{#if localStorage.getItem('formReferrer')}
91-
<BreadcrumbItem href={localStorage.getItem('formReferrer')}>Back to search</BreadcrumbItem>
91+
<BreadcrumbItem href={localStorage.getItem('formReferrer')}>Home</BreadcrumbItem>
9292
{:else}
9393
<BreadcrumbItem href={base}>Home</BreadcrumbItem>
9494
{/if}

src/routes/view/afile/[anum]/[pageslug]/+page.svelte

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
id: 'mirador',
6363
window: {
6464
imageToolsEnabled: true,
65+
hideWindowTitle: true,
6566
allowClose: false,
6667
allowFullscreen: true,
6768
allowMaximize: false,
@@ -106,11 +107,15 @@
106107
</script>
107108
108109
<Breadcrumb noTrailingSlash class="mb-8">
109-
{#if localStorage.getItem('resultReferrer')}
110-
<BreadcrumbItem href={localStorage.getItem('resultReferrer')}>Back to results</BreadcrumbItem>
110+
{#if localStorage.getItem('formReferrer')}
111+
<BreadcrumbItem href={localStorage.getItem('formReferrer')}>Home</BreadcrumbItem>
111112
{:else}
112113
<BreadcrumbItem href={base}>Home</BreadcrumbItem>
113114
{/if}
115+
{#if localStorage.getItem('resultReferrer')}
116+
<BreadcrumbItem href={localStorage.getItem('resultReferrer')}>Search Results</BreadcrumbItem>
117+
{/if}
118+
<BreadcrumbItem isCurrentPage>{afile.id}</BreadcrumbItem>
114119
</Breadcrumb>
115120
116121
<h1 class="mb-8">{afile.fields.last_name?.nara}, {afile.fields.first_name?.nara}</h1>

0 commit comments

Comments
 (0)