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): nitpicks #1506

Merged
merged 7 commits into from
May 16, 2024
Merged

style(edit): nitpicks #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc2118d
style(edit): spacing in boxes and colors
purusott May 14, 2024
63ebea3
refactor(edit): remove divs
purusott May 14, 2024
9d8767b
refactor(edit): simplify styling
purusott May 15, 2024
b698e72
styling(edit): align box contents
purusott May 15, 2024
bc0bf8d
chore(edit): align choicechipgroup
purusott May 15, 2024
a24785b
styling(edit): align content in boxes
emilielr May 15, 2024
3aed5b5
chore(edit): nitpicks
purusott May 16, 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
45 changes: 22 additions & 23 deletions next-tavla/app/(admin)/edit/[id]/components/Footer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,35 @@ function Footer({
}

return (
<form
className="box flex flex-col justify-between"
action={submitOrgBoard}
>
<form className="box flex flex-col" action={submitOrgBoard}>
<div className="flex flex-row items-center gap-2">
<Heading3 margin="none">Infomelding</Heading3>
<Heading3 margin="bottom">Infomelding</Heading3>
<Tooltip
content="Skriv en kort tekst som skal vises nederst i tavlen."
placement="top"
>
<ValidationInfoIcon />
<ValidationInfoIcon className="mb-2" />
</Tooltip>
</div>
<TextField
label="Infomelding"
name="footer"
defaultValue={footer?.footer ?? ''}
readOnly={override && organizationBoard}
className="w-full"
/>
{organizationBoard && (
<Switch
checked={override}
onChange={() => setOverride(!override)}
name="override"
>
Vis infomelding fra organisasjonen.
</Switch>
)}
<div className="flex flex-row w-full mt-8 justify-end">
<div className="h-full">
<TextField
label="Infomelding"
name="footer"
defaultValue={footer?.footer ?? ''}
readOnly={override && organizationBoard}
className="w-full"
/>
{organizationBoard && (
<Switch
checked={override}
onChange={() => setOverride(!override)}
name="override"
>
Vis infomelding fra organisasjonen.
</Switch>
)}
</div>
<div className="flex flex-row mt-8 justify-end">
<SubmitButton variant="secondary" aria-label="Lagre kolonner">
Lagre infomelding
</SubmitButton>
Expand Down
30 changes: 15 additions & 15 deletions next-tavla/app/(admin)/edit/[id]/components/MetaSettings/Adress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@ function Address({ bid, location }: { bid: TBoardID; location?: TLocation }) {
saveLocation(bid, selectedPoint?.value)
addToast('Adresse oppdatert!')
}}
className="box flex flex-col justify-between"
className="box flex flex-col"
>
<div className="flex flex-row items-center gap-2">
<Heading3 margin="none">Lokasjon</Heading3>
<Heading3 margin="bottom">Lokasjon</Heading3>
<Tooltip
content="Under innstillingene til hvert stoppested kan du velge om gåavstanden fra tavlen sin lokasjon skal vises"
placement="top"
>
<ValidationInfoIcon />
<ValidationInfoIcon className="mb-2" />
</Tooltip>
</div>
<SearchableDropdown
label="Adresse"
items={pointItems}
selectedItem={selectedPoint}
onChange={setSelectedPoint}
debounceTimeout={1000}
clearable
/>
<div className="flex flex-row w-full mt-8 justify-end">
<SubmitButton variant="secondary" className="mt-8">
Lagre adresse
</SubmitButton>
<div className="h-full">
<SearchableDropdown
label="Hvor befinner tavlen seg?"
items={pointItems}
selectedItem={selectedPoint}
onChange={setSelectedPoint}
debounceTimeout={1000}
clearable
/>
</div>
<div className="flex flex-row mt-8 justify-end">
<SubmitButton variant="secondary">Lagre lokasjon</SubmitButton>
</div>
</form>
)
Expand Down
2 changes: 1 addition & 1 deletion next-tavla/app/(admin)/edit/[id]/components/MetaSettings/FontChoiceChip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function FontChoiceChip({ font }: { font: TFontSize }) {

return (
<ChoiceChipGroup
className="flex flex-row"
className="h-full"
name="font"
value={fontSize}
onChange={(e) => setFontSize(e.target.value as TFontSize)}
Expand Down
29 changes: 16 additions & 13 deletions 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 @@ -27,18 +27,21 @@ function MetaSettings({ bid, meta }: { bid: TBoardID; meta: TMeta }) {
await saveTitle(bid, name)
addToast('Tittel lagret!')
}}
className="box flex flex-col justify-between"
className="box flex flex-col"
>
<Heading3 margin="none">Navn på tavlen</Heading3>
<TextField
name="name"
className="w-full"
defaultValue={meta.title ?? DEFAULT_BOARD_NAME}
label="Navn på tavlen"
maxLength={30}
/>
<div className="flex flex-row w-full mt-8 justify-end">
<SubmitButton variant="secondary" className="mt-8">
<Heading3 margin="bottom">Navn</Heading3>
<div className="h-full">
<TextField
name="name"
className="w-full"
defaultValue={meta.title ?? DEFAULT_BOARD_NAME}
label="Navn på tavlen"
maxLength={30}
/>
</div>

<div className="flex flex-row justify-end mt-8">
<SubmitButton variant="secondary">
Lagre tittel
</SubmitButton>
</div>
Expand All @@ -52,9 +55,9 @@ function MetaSettings({ bid, meta }: { bid: TBoardID; meta: TMeta }) {
}}
className="box flex flex-col justify-between"
>
<Heading3 className="m-0">Velg tekststørrelse: </Heading3>
<Heading3 margin="bottom">Tekststørrelse </Heading3>
<FontChoiceChip font={meta.fontSize ?? 'medium'} />
<div className="flex flex-row w-full mt-8 justify-end">
<div className="flex flex-row mt-8 justify-end">
<SubmitButton variant="secondary">
Lagre tekststørrelse
</SubmitButton>
Expand Down
2 changes: 1 addition & 1 deletion next-tavla/app/(admin)/edit/[id]/components/TileCard/TransportModeCheckbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function TransportModeCheckbox({
/>
{transportModeNames(transportMode)}
</div>
<div className="border-b-tertiary border-b-2 my-2" />
<div className="border-b-secondary border-b-2 my-2" />
<div className="flex flex-row items-center">
<Checkbox
defaultChecked={
Expand Down
10 changes: 5 additions & 5 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 @@ -161,7 +161,7 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
>
<div>
<Heading4 className="m-0">Gåavstand</Heading4>
<Label>
<Label className="text-primary">
Vis gåavstand fra lokasjonen til Tavla til
stoppestedet
</Label>
Expand All @@ -181,7 +181,7 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
tile.walkingDistance?.visible ?? false
}
disabled={
tile.walkingDistance?.visible ?? true
tile.walkingDistance?.visible ?? false
}
>
Vis gåavstand
Expand All @@ -194,7 +194,7 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
</Heading4>
<Label>
Vis kun avganger som går om mer enn valgt antall
minutter.
minutter
</Label>
<TextField
label="Antall minutter"
Expand All @@ -211,7 +211,7 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
<Heading4 className="m-0">Kolonner</Heading4>
<SubParagraph className="mt-0">
Her bestemmer du hvilke kolonner som skal vises i
tavlen.
tavlen
</SubParagraph>
<div className="flex flex-row flex-wrap gap-4 mb-8">
{Object.entries(Columns).map(([key, value]) => {
Expand Down Expand Up @@ -278,7 +278,7 @@ function TileCard({ bid, tile }: { bid: TBoardID; tile: TTile }) {
Lagre endringer
</Heading3>
<Paragraph>
Du har endringer som ikke er lagret.
Du har endringer som ikke er lagret
</Paragraph>
<div className="flex flex-row gap-4">
<Button
Expand Down
2 changes: 1 addition & 1 deletion next-tavla/app/(admin)/organizations/components/MemberAdministration/MemberList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function MemberList({

{members.map((member) => (
<div
className="flex flex-row justify-between items-center py-2 border-b-2 border-b-secondary"
className="flex flex-row justify-between items-center py-2 border-b-2 border-b-primary"
key={member.uid}
>
<div>{member.email}</div>
Expand Down
2 changes: 1 addition & 1 deletion next-tavla/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

--estimated-time-color: var(--colors-validation-lava);
--divider-color: var(--colors-blues-blue20);
--border-color: var(--colors-greys-grey60);
--border-color: var(--colors-greys-grey50);

--tooltip-color: var(--colors-blues-blue10);
--tooltip-text-color: var(--colors-brand-white);
Expand Down
Loading