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(modals): set h3 on small modals #1670

Merged
merged 2 commits into from
Oct 10, 2024
Merged

style(modals): set h3 on small modals #1670

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
07b3a87
design(modals): set h3 on small modals
emilielr Oct 10, 2024
71b5686
remove unused import
emilielr Oct 10, 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
4 changes: 2 additions & 2 deletions tavla/app/(admin)/boards/components/Column/Delete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TBoard } from 'types/settings'
import { Tooltip } from '@entur/tooltip'
import { useModalWithValue } from '../../hooks/useModalWithValue'
import { Modal } from '@entur/modal'
import { Heading2, Paragraph } from '@entur/typography'
import { Heading3, Paragraph } from '@entur/typography'
import { HiddenInput } from 'components/Form/HiddenInput'
import { FormError } from 'app/(admin)/components/FormError'
import { useFormState } from 'react-dom'
Expand Down Expand Up @@ -54,7 +54,7 @@ function Delete({
<CloseIcon />
</SecondarySquareButton>
<Image src={sheep} alt="" className="h-1/2 w-1/2" />
<Heading2>Slett tavle</Heading2>
<Heading3 margin="bottom">Slett tavle</Heading3>
<Paragraph className="mb-8">
{board?.meta?.title
? `Er du sikker på at du vil slette tavlen "${board.meta.title}"? `
Expand Down
4 changes: 2 additions & 2 deletions tavla/app/(admin)/components/Delete/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { Button, IconButton, SecondarySquareButton } from '@entur/button'
import { CloseIcon, DeleteIcon } from '@entur/icons'
import { Modal } from '@entur/modal'
import { Heading2, Paragraph, SubParagraph } from '@entur/typography'
import { Heading3, Paragraph, SubParagraph } from '@entur/typography'
import { TOrganization } from 'types/settings'
import { TextField } from '@entur/form'
import { SubmitButton } from 'components/Form/SubmitButton'
Expand Down Expand Up @@ -88,7 +88,7 @@ function Delete({
<CloseIcon />
</SecondarySquareButton>
<Image src={ducks} alt="" className="h-1/2 w-1/2 mx-auto" />
<Heading2>Slett organisasjon</Heading2>
<Heading3 margin="bottom">Slett organisasjon</Heading3>
<Paragraph>
{`Er du sikker på at du vil slette organisasjonen
"${organization.name}"? Alle tavlene i organisasjonen vil også bli slettet.`}
Expand Down
2 changes: 1 addition & 1 deletion tavla/app/(admin)/components/Login/Create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function Create() {
className="h-1/2 w-1/2"
/>

<Heading3>Opprett ny bruker</Heading3>
<Heading3 margin="bottom">Opprett ny bruker</Heading3>
<form className="flex flex-col gap-4 w-full" action={action}>
<TextField
name="email"
Expand Down
2 changes: 1 addition & 1 deletion tavla/app/(admin)/components/Login/Email.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function Email() {
alt=""
className="h-1/2 w-1/2"
/>
<Heading3>Logg inn med e-post</Heading3>
<Heading3 margin="bottom">Logg inn med e-post</Heading3>
<form className="flex flex-col gap-4 w-full" action={action}>
<TextField
name="email"
Expand Down
2 changes: 1 addition & 1 deletion tavla/app/(admin)/components/Login/Reset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function Reset() {
alt=""
className="h-1/2 w-1/2"
/>
<Heading3>Glemt passord</Heading3>
<Heading3 margin="bottom">Glemt passord</Heading3>
<Paragraph>
Skriv inn e-posten du brukte for å opprette brukeren, så sender
vi deg en lenke for å tilbakestille passordet ditt.
Expand Down
2 changes: 1 addition & 1 deletion tavla/app/(admin)/components/Login/Start.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function Start() {
alt=""
className="h-1/2 w-1/2"
/>
<Heading3>Logg inn for å fortsette</Heading3>
<Heading3 margin="bottom">Logg inn for å fortsette</Heading3>
<Paragraph>
Logg inn for å få tilgang til å opprette og administrere tavler.
</Paragraph>
Expand Down
8 changes: 4 additions & 4 deletions tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { PrimaryButton, SecondarySquareButton } from '@entur/button'
import { AddIcon, CloseIcon } from '@entur/icons'
import { Modal } from '@entur/modal'
import { Heading2, Label, Paragraph } from '@entur/typography'
import { Heading3, Paragraph, SubParagraph } from '@entur/typography'
import { TextField } from '@entur/form'
import { useFormState } from 'react-dom'
import { getFormFeedbackForField } from 'app/(admin)/utils'
Expand Down Expand Up @@ -37,7 +37,7 @@ function CreateOrganization() {
<CloseIcon />
</SecondarySquareButton>
<Image src={birds} alt="" className="h-1/2 w-1/2" />
<Heading2>Opprett organisasjon</Heading2>
<Heading3>Opprett organisasjon</Heading3>
<Paragraph className="mt-8 text-center">
Organisasjonen gir deg mulighet til å samarbeide om tavler
med andre. Tavlene vil også organiseres etter organisasjon i
Expand All @@ -49,9 +49,9 @@ function CreateOrganization() {
aria-live="polite"
aria-relevant="all"
>
<Label className="font-medium">
<SubParagraph className="font-medium">
Sett navn på organisasjonen
</Label>
</SubParagraph>
<TextField
size="medium"
label="Organisasjonsnavn"
Expand Down
4 changes: 2 additions & 2 deletions tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IconButton, SecondarySquareButton } from '@entur/button'
import { CloseIcon, DeleteIcon } from '@entur/icons'
import { Modal } from '@entur/modal'
import { Tooltip } from '@entur/tooltip'
import { Heading2, Paragraph } from '@entur/typography'
import { Heading3, Paragraph } from '@entur/typography'
import { FormError } from 'app/(admin)/components/FormError'
import { getFormFeedbackForField } from 'app/(admin)/utils'
import { HiddenInput } from 'components/Form/HiddenInput'
Expand Down Expand Up @@ -53,7 +53,7 @@ function RemoveUserButton({
<CloseIcon />
</SecondarySquareButton>
<Image src={sheep} alt="" className="h-1/2 w-1/2" />
<Heading2>Slett medlem</Heading2>
<Heading3 margin="bottom">Slett medlem</Heading3>
<Paragraph className="mt-8">
Er du sikker på at du vil slette medlem med e-postadresse{' '}
{user?.email} fra organisasjonen?
Expand Down