Skip to content

Commit 352c5a3

Browse files
authored
Import override styles for caching (#912)
* Import override styles for caching * Relocate styles for working import * Remove console.log
1 parent 40a6310 commit 352c5a3

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

File renamed without changes.

src/lib/styles/override-sab.css

Whitespace-only changes.

src/routes/+layout.svelte

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<script lang="ts">
2-
import { base } from '$app/paths';
32
import appleIconHref from '$assets/icons/apple-touch-icon.png';
43
import faviconHref from '$assets/icons/favicon.png';
54
import manifestHref from '$assets/manifestUrl.json';
6-
import '$lib/app.css';
5+
import '$lib/styles/app.css';
6+
import AudioPlaybackSpeed from '$lib/components/AudioPlaybackSpeed.svelte';
77
import CollectionSelector from '$lib/components/CollectionSelector.svelte';
88
import FontSelector from '$lib/components/FontSelector.svelte';
99
import NoteDialog from '$lib/components/NoteDialog.svelte';
10+
import PlanStopDialog from '$lib/components/PlanStopDialog.svelte';
1011
import Sidebar from '$lib/components/Sidebar.svelte';
1112
import TextAppearanceSelector from '$lib/components/TextAppearanceSelector.svelte';
1213
import catalog from '$lib/data/catalogData';
@@ -26,9 +27,6 @@
2627
s,
2728
theme
2829
} from '$lib/data/stores';
29-
import '$lib/app.css';
30-
import AudioPlaybackSpeed from '$lib/components/AudioPlaybackSpeed.svelte';
31-
import PlanStopDialog from '$lib/components/PlanStopDialog.svelte';
3230
import { onMount } from 'svelte';
3331
import { fromStore } from 'svelte/store';
3432
@@ -39,6 +37,13 @@
3937
query: '?url'
4038
}) as Record<string, string>;
4139
40+
const overrideStyles = import.meta.glob('./override-*.css', {
41+
import: 'default',
42+
eager: true,
43+
base: '/src/lib/styles',
44+
query: '?url'
45+
}) as Record<string, string>;
46+
4247
let { children } = $props();
4348
4449
const isSAB = config.programType == 'SAB';
@@ -122,8 +127,11 @@
122127
{#if $refs.initialized}
123128
<link rel="stylesheet" href={styles[`./sab-bc-${$refs.collection}.css`]} />
124129
{/if}
125-
<link rel="stylesheet" href="{base}/override-sab.css" />
126130
{/if}
131+
<link
132+
rel="stylesheet"
133+
href={overrideStyles[`./override-${config.programType.toLowerCase()}.css`]}
134+
/>
127135
</svelte:head>
128136

129137
{#if showPage}

0 commit comments

Comments
 (0)