Skip to content

Commit 2e94ffa

Browse files
author
Sine Jespersen
authored
Merge pull request #57 from itk-dev/feature/3175-make-light-mode-work
Feature/3175 make light mode work
2 parents da63bb0 + e2ebbb3 commit 2e94ffa

File tree

9 files changed

+19
-15
lines changed

9 files changed

+19
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- [PR-57](https://github.com/itk-dev/aapodwalk/pull/57)
11+
- Improve lightmode
1012
- [PR-56](https://github.com/itk-dev/aapodwalk/pull/56)
1113
- Rename component `Map.jsx` -> `MapComponent.jsx` to "[not shadow the global "Map" property](https://eslint.org/docs/latest/rules/no-shadow)"
1214
- Create a mapper to map lats/longs to fit the outer bounds react-leaflet uses

src/components/FAQ.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ const FAQ = () => {
55
return (
66
<>
77
<h1 className="text-2xl font-extrabold">Hjælp og vejledning</h1>
8-
<section className="bg-zinc-100 dark:bg-zinc-900 flex flex-row relative my-2 rounded font-bold p-5 flex flex-col mt-5">
8+
<section className="bg-emerald-400 dark:bg-zinc-900 flex flex-row relative my-2 rounded font-bold p-5 flex flex-col mt-5">
99
Oplysninger om Aarhus Kommune Kultur og Borgerservices behandling af dine personoplysninger ved anvendelse af
1010
Podwalk
1111
<Link
1212
to={"/personal-information-policy"}
13-
className="text-emerald-400 dark:text-emerald-600 font-bold underline mt-5"
13+
className="text-zinc-900 dark:text-emerald-600 font-bold underline mt-5"
1414
>
1515
Læs hele oplysningsteksten
1616
</Link>
1717
</section>
18-
<section className="bg-zinc-100 dark:bg-zinc-900 flex flex-row relative my-2 rounded font-bold p-5 flex flex-col mt-5">
18+
<section className="bg-emerald-400 dark:bg-zinc-900 flex flex-row relative my-2 rounded font-bold p-5 flex flex-col mt-5">
1919
Sådan bruger du navigationen
20-
<Link to={"/navigation-help"} className="text-emerald-400 dark:text-emerald-800 font-bold underline mt-3">
20+
<Link to={"/navigation-help"} className="text-zinc-900 dark:text-emerald-800 font-bold underline mt-3">
2121
Vedledning til navigation
2222
</Link>
2323
</section>
24-
<section className="bg-zinc-100 dark:bg-zinc-900 flex flex-row relative my-2 rounded font-bold p-5 flex flex-col mt-5">
24+
<section className="bg-emerald-400 dark:bg-zinc-900 flex flex-row relative my-2 rounded font-bold p-5 flex flex-col mt-5">
2525
Tilgængelighedserklæring
26-
<Link className="text-emerald-400 dark:text-emerald-800 font-bold underline mt-5">
26+
<Link className="text-zinc-900 dark:text-emerald-800 font-bold underline mt-5">
2727
{/* todo add Tilgængelighedserklæring */}
2828
Tilgængelighed og en erklæring herom
2929
</Link>

src/components/MapConsentBanner.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function MapConsentBanner() {
1414
if (openStreetMapConsent === false || openStreetMapConsent === true) return null;
1515

1616
return (
17-
<div className="fixed left-3 bottom-3 right-3 dark:bg-zinc-600 flex flex-col gap-3 rounded-lg p-3 bg-emerald-400">
17+
<div className="fixed left-3 bottom-3 right-3 dark:bg-zinc-600 flex flex-col gap-3 rounded-lg p-3 bg-zinc-300">
1818
<div>
1919
<h2 className="mb-1 font-bold">Samtykke</h2>
2020
<div className="mt-1 flex flex-col">

src/components/Navbar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const Navbar = () => {
1414
{pathname === "/" && <img src={Logo} alt="" className="w-10 h-10" />}
1515
{pathname !== "/" && <BackButton />}
1616
<Link
17-
className="flex place-content-center rounded-full text-xl w-9 h-9 bg-black justify-center items-center"
17+
className="flex place-content-center rounded-full text-xl w-9 h-9 bg-emerald-400 dark:bg-black justify-center items-center"
1818
to="/faq"
1919
>
2020
<FontAwesomeIcon icon={faQuestion} />

src/components/points/OrderComponent.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { React } from "react";
22

33
const OrderComponent = ({ order }) => {
44
return (
5-
<div className="flex place-content-center rounded text-xl w-6 h-6 bg-black justify-center mb-2 items-center flex dark:bg-emerald-800">
5+
<div className="flex place-content-center rounded text-xl w-6 h-6 bg-black justify-center mb-2 items-center bg-white flex dark:bg-emerald-800">
66
{order}
77
</div>
88
);

src/components/points/Point.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ function Point({
8080
className={`relative text-left w-full ${unlocked ? "" : "pointer-events-none"}`}
8181
>
8282
<div
83-
className={`bg-zinc-100 dark:bg-zinc-700 flex flex-row relative h-32 my-2 rounded flex items-center ${
83+
className={`bg-emerald-400 dark:bg-zinc-700 flex flex-row relative h-32 my-2 rounded flex items-center ${
8484
unlocked ? "" : "opacity-35 blur-sm bg-zinc-100 dark:bg-zinc-900"
8585
}`}
8686
>
8787
<Image src={image} className="w-24 h-24 rounded grow w-1/4 ml-2 object-cover" />
8888
<div className="w-3/4 ml-2">
8989
<OrderComponent order={order} />
9090
<h2 className="text-xl font-bold">{name}</h2>
91-
<div className="line-clamp-2 text-zinc-300 mr-2">{subtitles}</div>
91+
<div className="line-clamp-2 text-zinc-900 dark:text-zinc-300 mr-2">{subtitles}</div>
9292
</div>
9393
</div>
9494
</button>

src/components/routes/Route.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Route({ route }) {
1414

1515
return (
1616
<Link
17-
className="bg-zinc-100 dark:bg-zinc-900 flex flex-row relative h-32 my-2 rounded"
17+
className="bg-emerald-400 dark:bg-zinc-900 flex flex-row relative h-32 my-2 rounded"
1818
to={`/route/${route.id}`}
1919
onClick={() => setSelectedRoute(route)}
2020
>

src/components/tags/Tag.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ function Tag({ title, id }) {
2525

2626
return (
2727
<button
28-
className={`block mr-1 rounded px-2 mt-1 h-6 font-bold bg-zinc-200 text-black ${
29-
selectedTag === id ? "bg-emerald-400 dark:bg-emerald-800 text-white" : ""
28+
className={`${
29+
selectedTag === id
30+
? "block mr-1 rounded px-2 mt-1 h-6 font-bold bg-emerald-400 dark:bg-emerald-800 text-black"
31+
: "block mr-1 rounded px-2 mt-1 h-6 font-bold bg-zinc-200 text-black"
3032
}`}
3133
type="button"
3234
onClick={() => setSelectedTag(id)}

src/components/tags/TagList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function TagList({ tags, classes = "" }) {
77
setDisplayTags(tags.map(({ title }) => title).join(", "));
88
}, []);
99

10-
return <span className={`text-emerald-400 dark:text-emerald-800 font-bold text-sm ${classes}`}>{displayTags}</span>;
10+
return <span className={`text-black dark:text-emerald-800 font-bold text-sm ${classes}`}>{displayTags}</span>;
1111
}
1212

1313
export default TagList;

0 commit comments

Comments
 (0)