From 07b3a87d2d2ee6d7073c99091bdff0d613d21a5a Mon Sep 17 00:00:00 2001 From: emilielr Date: Thu, 10 Oct 2024 09:52:09 +0200 Subject: [PATCH 1/2] design(modals): set h3 on small modals --- tavla/app/(admin)/boards/components/Column/Delete.tsx | 4 ++-- tavla/app/(admin)/components/Delete/index.tsx | 4 ++-- tavla/app/(admin)/components/Login/Create.tsx | 2 +- tavla/app/(admin)/components/Login/Email.tsx | 4 ++-- tavla/app/(admin)/components/Login/Reset.tsx | 2 +- tavla/app/(admin)/components/Login/Start.tsx | 2 +- .../organizations/components/CreateOrganization/index.tsx | 8 ++++---- .../components/MemberAdministration/RemoveUserButton.tsx | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tavla/app/(admin)/boards/components/Column/Delete.tsx b/tavla/app/(admin)/boards/components/Column/Delete.tsx index a8b7602d4..58cf392ca 100644 --- a/tavla/app/(admin)/boards/components/Column/Delete.tsx +++ b/tavla/app/(admin)/boards/components/Column/Delete.tsx @@ -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' @@ -54,7 +54,7 @@ function Delete({ - Slett tavle + Slett tavle {board?.meta?.title ? `Er du sikker på at du vil slette tavlen "${board.meta.title}"? ` diff --git a/tavla/app/(admin)/components/Delete/index.tsx b/tavla/app/(admin)/components/Delete/index.tsx index eaa557589..fd1a8dd4f 100644 --- a/tavla/app/(admin)/components/Delete/index.tsx +++ b/tavla/app/(admin)/components/Delete/index.tsx @@ -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' @@ -88,7 +88,7 @@ function Delete({ - Slett organisasjon + Slett organisasjon {`Er du sikker på at du vil slette organisasjonen "${organization.name}"? Alle tavlene i organisasjonen vil også bli slettet.`} diff --git a/tavla/app/(admin)/components/Login/Create.tsx b/tavla/app/(admin)/components/Login/Create.tsx index afb10716f..16a2674d4 100644 --- a/tavla/app/(admin)/components/Login/Create.tsx +++ b/tavla/app/(admin)/components/Login/Create.tsx @@ -56,7 +56,7 @@ function Create() { className="h-1/2 w-1/2" /> - Opprett ny bruker + Opprett ny bruker
- Logg inn med e-post + Logg inn med e-post - Glemt passord + Glemt passord Skriv inn e-posten du brukte for å opprette brukeren, så sender vi deg en lenke for å tilbakestille passordet ditt. diff --git a/tavla/app/(admin)/components/Login/Start.tsx b/tavla/app/(admin)/components/Login/Start.tsx index 9f52dac70..d4b4ce9a7 100644 --- a/tavla/app/(admin)/components/Login/Start.tsx +++ b/tavla/app/(admin)/components/Login/Start.tsx @@ -17,7 +17,7 @@ function Start() { alt="" className="h-1/2 w-1/2" /> - Logg inn for å fortsette + Logg inn for å fortsette Logg inn for å få tilgang til å opprette og administrere tavler. diff --git a/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx b/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx index f78370901..ff700fe5a 100644 --- a/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx +++ b/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx @@ -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' @@ -37,7 +37,7 @@ function CreateOrganization() { - Opprett organisasjon + Opprett organisasjon Organisasjonen gir deg mulighet til å samarbeide om tavler med andre. Tavlene vil også organiseres etter organisasjon i @@ -49,9 +49,9 @@ function CreateOrganization() { aria-live="polite" aria-relevant="all" > - + - Slett medlem + Slett medlem Er du sikker på at du vil slette medlem med e-postadresse{' '} {user?.email} fra organisasjonen? From 71b568654d68b2475ea866c0908f75626e1454ff Mon Sep 17 00:00:00 2001 From: emilielr Date: Thu, 10 Oct 2024 09:53:45 +0200 Subject: [PATCH 2/2] remove unused import --- tavla/app/(admin)/components/Login/Email.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tavla/app/(admin)/components/Login/Email.tsx b/tavla/app/(admin)/components/Login/Email.tsx index 36e9325e1..16d37b320 100644 --- a/tavla/app/(admin)/components/Login/Email.tsx +++ b/tavla/app/(admin)/components/Login/Email.tsx @@ -7,7 +7,7 @@ import { } from 'firebase/auth' import { getClientApp } from 'utils/firebase' import { login } from './actions' -import { Heading3, Paragraph } from '@entur/typography' +import { Heading3 } from '@entur/typography' import { TextField } from '@entur/form' import { Button } from '@entur/button' import Image from 'next/image'