Skip to content

Commit b6821d1

Browse files
dabreegsterdabreegster
committed
Get rid of dark mode for now, so there's only one UI to try and tune
1 parent 826cccd commit b6821d1

14 files changed

+15
-76
lines changed

‎web/assets/delete_light.svg ‎web/assets/delete.svg

File renamed without changes.

‎web/assets/delete_dark.svg

-1
This file was deleted.

‎web/assets/edit_light.svg ‎web/assets/edit.svg

File renamed without changes.

‎web/assets/edit_dark.svg

-1
This file was deleted.

‎web/assets/logo_light.svg ‎web/assets/logo.svg

File renamed without changes.

‎web/assets/logo_dark.svg

-14
This file was deleted.

‎web/assets/settings_light.svg ‎web/assets/settings.svg

File renamed without changes.

‎web/assets/settings_dark.svg

-1
This file was deleted.

‎web/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html lang="en" data-theme="light">
33
<head>
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

‎web/src/App.svelte

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<script lang="ts">
22
import About from "./About.svelte";
33
import onewayArrowUrl from "../assets/arrow.png?url";
4-
import logoLight from "../assets/logo_light.svg?url";
5-
import logoDark from "../assets/logo_dark.svg?url";
4+
import logo from "../assets/logo.svg?url";
65
import "@picocss/pico/css/pico.jade.min.css";
76
import initLtn from "backend";
87
import type { Map } from "maplibre-gl";
@@ -29,7 +28,6 @@
2928
app,
3029
map as mapStore,
3130
showAbout,
32-
lightMode,
3331
mode,
3432
maptilerBasemap,
3533
maptilerApiKey,
@@ -88,11 +86,7 @@
8886
<Layout>
8987
<div slot="top" style="display: flex">
9088
<button class="outline" on:click={() => ($showAbout = true)}>
91-
<img
92-
src={$lightMode ? logoLight : logoDark}
93-
style="height: 6vh;"
94-
alt="A/B Street logo"
95-
/>
89+
<img src={logo} style="height: 6vh;" alt="A/B Street logo" />
9690
</button>
9791
<Settings />
9892
<span bind:this={topDiv} style="width: 100%" />

‎web/src/NetworkMode.svelte

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<script lang="ts">
2-
import deleteLight from "../assets/delete_light.svg?url";
3-
import deleteDark from "../assets/delete_dark.svg?url";
4-
import editLight from "../assets/edit_light.svg?url";
5-
import editDark from "../assets/edit_dark.svg?url";
2+
import deleteIcon from "../assets/delete.svg?url";
3+
import editIcon from "../assets/edit.svg?url";
64
import { downloadGeneratedFile, notNull } from "svelte-utils";
75
import type { Feature } from "geojson";
86
import { FillLayer, GeoJSON, hoverStateFilter } from "svelte-maplibre";
97
import { layerId, Popup, Link } from "./common";
108
import ModalFilterLayer from "./ModalFilterLayer.svelte";
119
import { SplitComponent } from "svelte-utils/top_bar_layout";
12-
import { lightMode, app, autosave, mode, projectName } from "./stores";
10+
import { app, autosave, mode, projectName } from "./stores";
1311
1412
// Note we do this to trigger a refresh when loading stuff
1513
$: gj = JSON.parse($app!.toSavefile());
@@ -122,19 +120,13 @@
122120
class="secondary"
123121
on:click={() => renameNeighbourhood(name)}
124122
>
125-
<img
126-
src={$lightMode ? editLight : editDark}
127-
alt="Rename neighbourhood"
128-
/>
123+
<img src={editIcon} alt="Rename neighbourhood" />
129124
</button>
130125
<button
131126
class="secondary"
132127
on:click={() => deleteNeighbourhood(name)}
133128
>
134-
<img
135-
src={$lightMode ? deleteLight : deleteDark}
136-
alt="Delete neighbourhood"
137-
/>
129+
<img src={deleteIcon} alt="Delete neighbourhood" />
138130
</button>
139131
</span>
140132
</li>

‎web/src/Settings.svelte

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,19 @@
11
<script lang="ts">
22
import { BasemapPicker } from "./common";
33
import { Modal } from "svelte-utils";
4-
import { lightMode } from "./stores";
5-
import settingsLight from "../assets/settings_light.svg?url";
6-
import settingsDark from "../assets/settings_dark.svg?url";
4+
import icon from "../assets/settings.svg?url";
75
86
let show = false;
9-
10-
$: document.documentElement.setAttribute(
11-
"data-theme",
12-
$lightMode ? "light" : "dark",
13-
);
147
</script>
158

169
<button class="outline" on:click={() => (show = true)}>
17-
<img src={$lightMode ? settingsLight : settingsDark} alt="Settings" />
10+
<img src={icon} alt="Settings" />
1811
</button>
1912

2013
{#if show}
2114
<Modal on:close={() => (show = false)}>
2215
<h1>Settings</h1>
2316
<BasemapPicker />
24-
<label>
25-
<input type="checkbox" role="switch" bind:checked={$lightMode} />
26-
Light mode
27-
</label>
2817
<center><button on:click={() => (show = false)}>Confirm</button></center>
2918
</Modal>
3019
{/if}

‎web/src/stores.ts

-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ export type Mode =
4141
export let map: Writable<Map | null> = writable(null);
4242
export let maptilerBasemap: Writable<string> = writable("dataviz");
4343

44-
export let lightMode: Writable<boolean> = writable(
45-
!window.matchMedia("(prefers-color-scheme: dark)").matches,
46-
);
47-
4844
export let useLocalVite: Writable<boolean> = writable(false);
4945
// The exact key in local storage
5046
export let projectName: Writable<string> = writable("");

‎web/src/title/TitleMode.svelte

+5-20
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
<script lang="ts">
2-
import deleteLight from "../../assets/delete_light.svg?url";
3-
import deleteDark from "../../assets/delete_dark.svg?url";
4-
import editLight from "../../assets/edit_light.svg?url";
5-
import editDark from "../../assets/edit_dark.svg?url";
2+
import deleteIcon from "../../assets/delete.svg?url";
3+
import editIcon from "../../assets/edit.svg?url";
64
import { Link } from "../common";
75
import { SplitComponent } from "svelte-utils/top_bar_layout";
8-
import {
9-
lightMode,
10-
app,
11-
projectName,
12-
map,
13-
mode,
14-
route_tool,
15-
} from "../stores";
6+
import { app, projectName, map, mode, route_tool } from "../stores";
167
import { loadFromLocalStorage } from "./loader";
178
import { Loading } from "svelte-utils";
189
@@ -122,19 +113,13 @@
122113
class="secondary"
123114
on:click={() => renameProject(project)}
124115
>
125-
<img
126-
src={$lightMode ? editLight : editDark}
127-
alt="Rename project"
128-
/>
116+
<img src={editIcon} alt="Rename project" />
129117
</button>
130118
<button
131119
class="secondary"
132120
on:click={() => deleteProject(project)}
133121
>
134-
<img
135-
src={$lightMode ? deleteLight : deleteDark}
136-
alt="Delete project"
137-
/>
122+
<img src={deleteIcon} alt="Delete project" />
138123
</button>
139124
</span>
140125
</li>

0 commit comments

Comments
 (0)