Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style(edit): color on subtexts #1541

Merged
merged 2 commits into from
Jun 6, 2024
Merged

style(edit): color on subtexts #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46995ce
fix(styling): cleanup and correct color on texts
emilielr Jun 6, 2024
d58783f
fix(edit): rename button
emilielr Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion next-tavla/app/(admin)/edit/[id]/components/MetaSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
87 changes: 36 additions & 51 deletions next-tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 }) => (
Expand Down