From 46995ce3d646ab58460ca1a0b8f95bb37a9e98aa Mon Sep 17 00:00:00 2001
From: emilielr <emilie.rognli@gmail.com>
Date: Thu, 6 Jun 2024 10:20:50 +0200
Subject: [PATCH 1/2] fix(styling): cleanup and correct color on texts

---
 .../edit/[id]/components/TileCard/index.tsx   | 87 ++++++++-----------
 1 file changed, 36 insertions(+), 51 deletions(-)

diff --git a/next-tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx b/next-tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx
index 8e65b609b..1770ed484 100644
--- a/next-tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx
+++ b/next-tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx
@@ -159,57 +159,44 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
                         onSubmit={reset}
                         onInput={() => setChanged(true)}
                     >
-                        <div>
-                            <Heading4 className="m-0">Gåavstand</Heading4>
-                            <Label className="text-primary">
-                                Vis gåavstand fra lokasjonen til Tavla til
-                                stoppestedet
-                            </Label>
-                            <div className="flex flex-col">
-                                {tile.walkingDistance?.visible ?? (
-                                    <Label
-                                        className="text-warning mb-2"
-                                        margin="top"
-                                    >
-                                        Du må legge til en lokasjon for å kunne
-                                        skru på gåavstand
-                                    </Label>
-                                )}
-                                <Switch
-                                    name="showDistance"
-                                    defaultChecked={
-                                        tile.walkingDistance?.visible ?? false
-                                    }
-                                    disabled={
-                                        tile.walkingDistance ? false : true
-                                    }
-                                >
-                                    Vis gåavstand
-                                </Switch>
-                            </div>
-                        </div>
-                        <div className="gap-4 mb-8">
-                            <Heading4 className="mb-1">
-                                Avganger frem i tid
-                            </Heading4>
-                            <Label>
-                                Vis kun avganger som går om mer enn valgt antall
-                                minutter
-                            </Label>
-                            <TextField
-                                label="Antall minutter"
-                                name="offset"
-                                type="number"
-                                min={0}
-                                className="w-full sm:w-1/3"
-                                defaultValue={
-                                    tile.offset ? tile.offset : undefined
+                        <Heading4 margin="none">Gåavstand</Heading4>
+                        <SubParagraph>
+                            Vis gåavstand fra lokasjonen til Tavla til
+                            stoppestedet
+                        </SubParagraph>
+                        <div className="flex flex-col">
+                            {tile.walkingDistance?.visible ?? (
+                                <Label className="!text-error">
+                                    Du må legge til en lokasjon for å kunne skru
+                                    på gåavstand
+                                </Label>
+                            )}
+                            <Switch
+                                name="showDistance"
+                                defaultChecked={
+                                    tile.walkingDistance?.visible ?? false
                                 }
-                            />
+                                disabled={tile.walkingDistance ? false : true}
+                            >
+                                Vis gåavstand
+                            </Switch>
                         </div>
+                        <Heading4>Avganger frem i tid</Heading4>
+                        <SubParagraph>
+                            Vis kun avganger som går om mer enn valgt antall
+                            minutter
+                        </SubParagraph>
+                        <TextField
+                            label="Antall minutter"
+                            name="offset"
+                            type="number"
+                            min={0}
+                            className="w-full sm:w-1/3"
+                            defaultValue={tile.offset ? tile.offset : undefined}
+                        />
 
-                        <Heading4 className="m-0">Kolonner</Heading4>
-                        <SubParagraph className="mt-0">
+                        <Heading4>Kolonner</Heading4>
+                        <SubParagraph>
                             Her bestemmer du hvilke kolonner som skal vises i
                             tavlen
                         </SubParagraph>
@@ -233,9 +220,7 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
                                 )
                             })}
                         </div>
-                        <Heading4 className="mr-2">
-                            Transportmidler og linjer
-                        </Heading4>
+                        <Heading4>Transportmidler og linjer</Heading4>
                         <div className="flex flex-row gap-4">
                             {linesByModeSorted.map(
                                 ({ transportMode, lines }) => (

From d58783f082078f0065d48cdbe57406e78451a87f Mon Sep 17 00:00:00 2001
From: emilielr <emilie.rognli@gmail.com>
Date: Thu, 6 Jun 2024 10:22:30 +0200
Subject: [PATCH 2/2] fix(edit): rename button

---
 .../app/(admin)/edit/[id]/components/MetaSettings/index.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/next-tavla/app/(admin)/edit/[id]/components/MetaSettings/index.tsx b/next-tavla/app/(admin)/edit/[id]/components/MetaSettings/index.tsx
index 7e2439d16..7803eca45 100644
--- a/next-tavla/app/(admin)/edit/[id]/components/MetaSettings/index.tsx
+++ b/next-tavla/app/(admin)/edit/[id]/components/MetaSettings/index.tsx
@@ -42,7 +42,7 @@ function MetaSettings({ bid, meta }: { bid: TBoardID; meta?: TMeta }) {
 
                 <div className="flex flex-row justify-end mt-8">
                     <SubmitButton variant="secondary" className="max-sm:w-full">
-                        Lagre tittel
+                        Lagre navn
                     </SubmitButton>
                 </div>
             </form>