finished merging

This commit is contained in:
2026-06-09 16:54:31 +09:00
parent 640c241e1c
commit 5356c05654
2 changed files with 2 additions and 17 deletions

View File

@@ -2,7 +2,7 @@
import Layout from './lib/layout/Layout.svelte'; import Layout from './lib/layout/Layout.svelte';
import WorldMap from './lib/world-map/WorldMap.svelte'; import WorldMap from './lib/world-map/WorldMap.svelte';
import StatsPanel from './lib/world-map/StatsPanel.svelte'; import StatsPanel from './lib/world-map/StatsPanel.svelte';
import Timeline from './lib/Timeline.svelte'; import TimelineView from './lib/TimelineView.svelte';
let screen = $state('worldmap'); let screen = $state('worldmap');
@@ -20,7 +20,7 @@
<StatsPanel /> <StatsPanel />
</div> </div>
{:else} {:else}
<Timeline /> <TimelineView />
{/if} {/if}
</Layout> </Layout>

View File

@@ -1,15 +0,0 @@
<div class="placeholder">
<p>Timeline — coming soon</p>
</div>
<style>
.placeholder {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font: 16px/1.4 sans-serif;
color: #888;
}
</style>