diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json index 3dd7925bf..05e6ca85b 100644 --- a/frontend/.vscode/settings.json +++ b/frontend/.vscode/settings.json @@ -39,5 +39,11 @@ }, "[jsonc]": { "editor.defaultFormatter": "biomejs.biome" - } + }, + "tailwindCSS.experimental.classRegex": [ + ":\\s*?[\"'`]([^\"'`]*).*?,", + "const\\s\\w*Classes\\s+=\\s+[\"'`]([^\"'`]*)", + "const\\s\\w*_CLASSES\\s+=\\s+[\"'`]([^\"'`]*)", + "@tw\\s\\*/\\s+[\"'`]([^\"'`]*)" + ] } diff --git a/frontend/index.css b/frontend/index.css index 23ec1d539..cd2d0e08b 100644 --- a/frontend/index.css +++ b/frontend/index.css @@ -2,14 +2,22 @@ @import "@navikt/ds-css" layer(components); @import "./fonts.css" layer(fonts); +@layer components { + @theme { + --a-font-family: "Source Sans 3", Arial, sans-serif; + } +} + :root { - --a-font-family: 'Source Sans 3', Arial, sans-serif; + --a-font-family: "Source Sans 3", Arial, sans-serif; +} + +@theme { + --font-display: "Source Sans 3", Arial, sans-serif; } html { box-sizing: border-box; - font-family: 'Source Sans 3', Arial, sans-serif; - font-size: var(--a-spacing-4); } *, @@ -17,24 +25,3 @@ html { *::after { box-sizing: inherit; } - -html, -body, -#app { - height: 100%; - width: 100%; - margin: 0; - padding: 0; - overflow: hidden; - font-size: var(--a-spacing-4); -} - -#app { - display: flex; - flex-flow: column; -} - -.smart-editor { - outline: none; - min-height: 100%; -} diff --git a/frontend/index.html b/frontend/index.html index 2e98ec028..5e09d3384 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,5 +1,6 @@ - + @@ -13,8 +14,8 @@ - -
+ +
\ No newline at end of file diff --git a/frontend/src/components/access-rights/access-rights.tsx b/frontend/src/components/access-rights/access-rights.tsx index a249eec62..bd5069228 100644 --- a/frontend/src/components/access-rights/access-rights.tsx +++ b/frontend/src/components/access-rights/access-rights.tsx @@ -9,7 +9,6 @@ import type { IYtelse } from '@app/types/kodeverk'; import { CheckmarkIcon, XMarkIcon } from '@navikt/aksel-icons'; import { Button, HStack, Heading, Loader } from '@navikt/ds-react'; import { useContext, useState } from 'react'; -import { styled } from 'styled-components'; import { Body } from './body'; import { Head } from './head'; @@ -68,8 +67,8 @@ const AccessRightsContent = ({ ytelser, saksbehandlere }: Props) => { return ( <> - - setFocusedCell([-1, -1])}> +
+ setFocusedCell([-1, -1])}> { focusedCell={focusedCell} setFocusedCell={setFocusedCell} /> - - +
+
@@ -227,7 +227,7 @@ const SelectGosysOppgave = () => { variant="secondary" size="small" onClick={onShowOpenClick} - style={{ alignSelf: 'flex-start' }} + className="self-start" disabled={showOpen && !hasGosysOppgaveId} > {showOpen ? 'Vis bare valgt' : 'Bytt oppgave'} @@ -238,7 +238,7 @@ const SelectGosysOppgave = () => { variant="secondary" size="small" onClick={onShowOtherClick} - style={{ alignSelf: 'flex-start' }} + className="self-start" icon={showOther ? : } > {showOther diff --git a/frontend/src/components/behandling/behandlingsdetaljer/tilbakekreving.tsx b/frontend/src/components/behandling/behandlingsdetaljer/tilbakekreving.tsx index 88e5a2fd8..cded9d472 100644 --- a/frontend/src/components/behandling/behandlingsdetaljer/tilbakekreving.tsx +++ b/frontend/src/components/behandling/behandlingsdetaljer/tilbakekreving.tsx @@ -2,7 +2,6 @@ import { useOppgave } from '@app/hooks/oppgavebehandling/use-oppgave'; import { useCanEditBehandling } from '@app/hooks/use-can-edit'; import { useSetTilbakekrevingMutation } from '@app/redux-api/oppgaver/mutations/set-tilbakekreving'; import { Alert, BodyShort, Checkbox, CheckboxGroup, HStack, Heading, HelpText } from '@navikt/ds-react'; -import { styled } from 'styled-components'; const TILBAKEKREVING_IDS = [ '144', @@ -41,12 +40,12 @@ export const Tilbakekreving = () => { if (!canEdit) { return ( - - +
+ Tilbakekreving Gjelder{tilbakekreving ? ' ' : ' ikke '}en tilbakekrevingssak - +
); } @@ -65,7 +64,7 @@ export const Tilbakekreving = () => { ); return ( - +
{ {showWarning ? : null} - +
); }; @@ -86,7 +85,3 @@ const Warning = () => ( at dette er riktig? ); - -const Container = styled.div` - margin-top: var(--a-spacing-4); -`; diff --git a/frontend/src/components/common-table-components/oppgave-rows/oppgave-row.tsx b/frontend/src/components/common-table-components/oppgave-rows/oppgave-row.tsx index 19415c4fc..f3ea7f290 100644 --- a/frontend/src/components/common-table-components/oppgave-rows/oppgave-row.tsx +++ b/frontend/src/components/common-table-components/oppgave-rows/oppgave-row.tsx @@ -52,7 +52,6 @@ export const OppgaveRow = ({ oppgaveId, columns, testId }: Props): JSX.Element = }; const getColumns = (columnKeys: ColumnKeyEnum[], oppgave: IOppgave) => - // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: ¯\_(ツ)_/¯ columnKeys.map((key) => { switch (key) { case ColumnKeyEnum.Type: diff --git a/frontend/src/components/common-table-components/oppgave-table/filter-dropdowns/registreringshjemler.tsx b/frontend/src/components/common-table-components/oppgave-table/filter-dropdowns/registreringshjemler.tsx index 30f9ca95a..00dd91dda 100644 --- a/frontend/src/components/common-table-components/oppgave-table/filter-dropdowns/registreringshjemler.tsx +++ b/frontend/src/components/common-table-components/oppgave-table/filter-dropdowns/registreringshjemler.tsx @@ -30,7 +30,7 @@ export const Registreringshjemler = ({ params, setParams, columnKey }: FilterDro const chevron = open ? : ; return ( - + {TABLE_HEADERS[columnKey]} ({params.registreringshjemler?.length ?? 0}) {chevron} diff --git a/frontend/src/components/datetime/datetime.tsx b/frontend/src/components/datetime/datetime.tsx index af442c87f..f833e2e21 100644 --- a/frontend/src/components/datetime/datetime.tsx +++ b/frontend/src/components/datetime/datetime.tsx @@ -19,7 +19,7 @@ export const ModifiedCreatedDateTime = ({ id, lastEdit, created }: Props) => { return ( - } dateTime={dateTime} title={title} /> + } dateTime={dateTime} title={title} /> {lastEdit === undefined ? null : , av {lastEdit.actor.navn}} @@ -34,7 +34,7 @@ interface DateTimeProps { } export const DateTime = ({ dateTime, title, icon, id }: DateTimeProps) => ( - + {icon} {isoDateTimeToPretty(dateTime)} diff --git a/frontend/src/components/deassign/popup.tsx b/frontend/src/components/deassign/popup.tsx index 14d3e6990..0643811b9 100644 --- a/frontend/src/components/deassign/popup.tsx +++ b/frontend/src/components/deassign/popup.tsx @@ -72,7 +72,7 @@ export const Popup = ({ oppgaveId, typeId, ytelseId, hjemmelIdList, close, direc gap="2" padding="4" width="280px" - style={{ zIndex: 10, [direction === Direction.UP ? 'bottom' : 'top']: '100%' }} + className={`z-10 ${direction === Direction.UP ? 'bottom-full' : 'top-full'}`} data-testid="deassign-oppgave-popup" > diff --git a/frontend/src/components/documents/expanded-documents.tsx b/frontend/src/components/documents/expanded-documents.tsx index e4d50b4cd..e2c58f459 100644 --- a/frontend/src/components/documents/expanded-documents.tsx +++ b/frontend/src/components/documents/expanded-documents.tsx @@ -112,7 +112,8 @@ export const ExpandedDocuments = () => { overflowY="hidden" overflowX="auto" position="relative" - style={{ minWidth, resize: 'horizontal' }} + minWidth={`${minWidth}px`} + className="resize-x" ref={ref} > diff --git a/frontend/src/components/documents/journalfoerte-documents/document-list.tsx b/frontend/src/components/documents/journalfoerte-documents/document-list.tsx index eb137d63a..4ae3e6431 100644 --- a/frontend/src/components/documents/journalfoerte-documents/document-list.tsx +++ b/frontend/src/components/documents/journalfoerte-documents/document-list.tsx @@ -83,7 +83,7 @@ export const DocumentList = ({ if (isLoading) { return ( - + diff --git a/frontend/src/components/documents/journalfoerte-documents/header/included-filter.tsx b/frontend/src/components/documents/journalfoerte-documents/header/included-filter.tsx index 789615e8a..418132427 100644 --- a/frontend/src/components/documents/journalfoerte-documents/header/included-filter.tsx +++ b/frontend/src/components/documents/journalfoerte-documents/header/included-filter.tsx @@ -8,7 +8,7 @@ export const IncludedFilter = () => { const title = value ? 'Viser kun inkluderte dokumenter.' : 'Viser alle dokumenter.'; return ( - + setValue(!value)} title={title}> {title} diff --git a/frontend/src/components/documents/new-documents/modal/pdf-preview/pdf-preview.tsx b/frontend/src/components/documents/new-documents/modal/pdf-preview/pdf-preview.tsx index a7f2be79b..6a7b76e61 100644 --- a/frontend/src/components/documents/new-documents/modal/pdf-preview/pdf-preview.tsx +++ b/frontend/src/components/documents/new-documents/modal/pdf-preview/pdf-preview.tsx @@ -31,7 +31,7 @@ export const PDFPreview = ({ isLoading, noFlickerReload }: Props) => { }, [onReload, setVersions]); return ( -
+
diff --git a/frontend/src/components/documents/new-documents/new-documents.tsx b/frontend/src/components/documents/new-documents/new-documents.tsx index 23809e3c9..af0b0d77a 100644 --- a/frontend/src/components/documents/new-documents/new-documents.tsx +++ b/frontend/src/components/documents/new-documents/new-documents.tsx @@ -261,7 +261,7 @@ export const NewDocuments = () => {
{ const clamped = clamp(currentTarget.scrollTop, 0, currentTarget.scrollHeight - currentTarget.clientHeight); // Elastic scrolling in Safari can exceed the boundries. _setScrollTop(clamped); @@ -269,7 +269,8 @@ export const NewDocuments = () => { > {documentNodes} diff --git a/frontend/src/components/editable-title/editable-title.tsx b/frontend/src/components/editable-title/editable-title.tsx index c6e84f0de..941eaeba2 100644 --- a/frontend/src/components/editable-title/editable-title.tsx +++ b/frontend/src/components/editable-title/editable-title.tsx @@ -23,7 +23,7 @@ export const EditableTitle = ({ title, onChange, label, isLoading }: Props) => { }; return ( - + { aria-label={label} aria-placeholder="Skriv inn tittel" ref={ref} - style={{ opacity: isLoading ? 0.5 : 1 }} + className={isLoading ? 'opacity-50' : 'opacity-100'} onFocus={(e) => { setCaretAtEnd(e.currentTarget); }} diff --git a/frontend/src/components/feilregistrering/feilregistrering.tsx b/frontend/src/components/feilregistrering/feilregistrering.tsx index 0e7511105..2909bf126 100644 --- a/frontend/src/components/feilregistrering/feilregistrering.tsx +++ b/frontend/src/components/feilregistrering/feilregistrering.tsx @@ -80,13 +80,7 @@ const FeilregistrerPanel = ({ oppgaveId, position, align, fagsystemId }: Oppgave return ( {children} diff --git a/frontend/src/components/filter-dropdown/grouped-filter-list.tsx b/frontend/src/components/filter-dropdown/grouped-filter-list.tsx index 7db8115ff..9782108da 100644 --- a/frontend/src/components/filter-dropdown/grouped-filter-list.tsx +++ b/frontend/src/components/filter-dropdown/grouped-filter-list.tsx @@ -109,12 +109,7 @@ export const GroupedFilterList = ({ position="absolute" width="350px" height="400px" - style={{ - zIndex: 2, - scrollMarginBottom: 'var(--a-spacing-4)', - top: isDown ? '100%' : '0', - left: isDown ? '0' : '100%', - }} + className={`z-2 scroll-mb-4 ${isDown ? 'top-full left-0' : 'top-0 left-full'}`} ref={ref} > diff --git a/frontend/src/components/filter-dropdown/header.tsx b/frontend/src/components/filter-dropdown/header.tsx index c63d2ebdf..9f6af557f 100644 --- a/frontend/src/components/filter-dropdown/header.tsx +++ b/frontend/src/components/filter-dropdown/header.tsx @@ -70,7 +70,7 @@ export const Header = ({ }; return ( - + + } /> - + - + {beskrivelse?.trim()} diff --git a/frontend/src/components/gosys/beskrivelse/beskrivelse.tsx b/frontend/src/components/gosys/beskrivelse/beskrivelse.tsx index 98f425fd6..49f4534a6 100644 --- a/frontend/src/components/gosys/beskrivelse/beskrivelse.tsx +++ b/frontend/src/components/gosys/beskrivelse/beskrivelse.tsx @@ -57,7 +57,7 @@ export const GosysBeskrivelse = ({ id, oppgavebeskrivelse }: Props) => { - + diff --git a/frontend/src/components/malteksteksjon-references/maltekstseksjon-references.tsx b/frontend/src/components/malteksteksjon-references/maltekstseksjon-references.tsx index 603d79f98..74a527df3 100644 --- a/frontend/src/components/malteksteksjon-references/maltekstseksjon-references.tsx +++ b/frontend/src/components/malteksteksjon-references/maltekstseksjon-references.tsx @@ -137,7 +137,7 @@ const ListItem = ({ id, onClick, selected }: ListItemProps) => { return ( - + diff --git a/frontend/src/components/oppgavebehandling-footer/deassign/hjemmel-list.tsx b/frontend/src/components/oppgavebehandling-footer/deassign/hjemmel-list.tsx index a0de01bf9..6f8275210 100644 --- a/frontend/src/components/oppgavebehandling-footer/deassign/hjemmel-list.tsx +++ b/frontend/src/components/oppgavebehandling-footer/deassign/hjemmel-list.tsx @@ -30,6 +30,7 @@ export const HjemmelList = ({ selected, ytelseId, direction, onChange, error }: ); const hasFilter = options.length > 10; + const isUp = direction === Direction.UP; return ( diff --git a/frontend/src/components/oppgavebehandling-footer/sett-paa-vent/panel.tsx b/frontend/src/components/oppgavebehandling-footer/sett-paa-vent/panel.tsx index f3a2d32e0..65af825b9 100644 --- a/frontend/src/components/oppgavebehandling-footer/sett-paa-vent/panel.tsx +++ b/frontend/src/components/oppgavebehandling-footer/sett-paa-vent/panel.tsx @@ -36,7 +36,7 @@ export const SettPaaVentPanel = ({ oppgaveId, close }: Props) => { }, []); return ( - + ( paddingInline="4" paddingBlock="2" width="100%" - style={{ zIndex: 23 }} + className="z-23" > {children} diff --git a/frontend/src/components/oppgavebehandling-footer/update-in-gosys/enhetmappe.tsx b/frontend/src/components/oppgavebehandling-footer/update-in-gosys/enhetmappe.tsx index 36f64a336..5f5b286e3 100644 --- a/frontend/src/components/oppgavebehandling-footer/update-in-gosys/enhetmappe.tsx +++ b/frontend/src/components/oppgavebehandling-footer/update-in-gosys/enhetmappe.tsx @@ -52,7 +52,7 @@ export const Enhetmappe = ({ enhetId, selectedMappe, setSelectedMappe, oppgavebe size="small" value={getValue(enhetId, selectedMappe)} onChange={({ target }) => setSelectedMappe(target.value === NONE ? null : Number.parseInt(target.value, 10))} - style={{ width: 250 }} + className="w-64" > {enhetId === null ? ( ); }; diff --git a/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx b/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx index 482e77d9e..066ef901d 100644 --- a/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx +++ b/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx @@ -107,7 +107,7 @@ const UpdateInGosysLoaded = ({ oppgavebehandling, enheter, initialBeskrivelse, c }; return ( -
+
diff --git a/frontend/src/components/oppgavestyring/fradel-button.tsx b/frontend/src/components/oppgavestyring/fradel-button.tsx index 3d46f7516..18b4d7c22 100644 --- a/frontend/src/components/oppgavestyring/fradel-button.tsx +++ b/frontend/src/components/oppgavestyring/fradel-button.tsx @@ -127,7 +127,7 @@ const Deassign = ({ id, typeId, ytelseId, sattPaaVent, hjemmelIdList }: IOppgave }; return ( - + ( - + ); diff --git a/frontend/src/components/popup-container/popup-container.tsx b/frontend/src/components/popup-container/popup-container.tsx index 2ed9c571e..455374ae8 100644 --- a/frontend/src/components/popup-container/popup-container.tsx +++ b/frontend/src/components/popup-container/popup-container.tsx @@ -20,7 +20,14 @@ export const PopupContainer = ({ children, close, direction }: Props) => { const isLeft = direction === Direction.LEFT; return ( - + {children} diff --git a/frontend/src/components/search/common/oppgaver.tsx b/frontend/src/components/search/common/oppgaver.tsx index 32c38e969..1dee2612c 100644 --- a/frontend/src/components/search/common/oppgaver.tsx +++ b/frontend/src/components/search/common/oppgaver.tsx @@ -46,7 +46,7 @@ export const Oppgaver = ({ data, isFetching, isLoading, error, refetch }: Oppgav }; const SkeletonTables = () => ( - +
diff --git a/frontend/src/components/settings/abbreviations/abbreviation.tsx b/frontend/src/components/settings/abbreviations/abbreviation.tsx index 57ebaca5c..6971de702 100644 --- a/frontend/src/components/settings/abbreviations/abbreviation.tsx +++ b/frontend/src/components/settings/abbreviations/abbreviation.tsx @@ -1,6 +1,6 @@ import { CheckmarkIcon, TrashIcon } from '@navikt/aksel-icons'; import { Button, ErrorMessage, TextField } from '@navikt/ds-react'; -import { type CSSProperties, type KeyboardEventHandler, useEffect, useState } from 'react'; +import { type KeyboardEventHandler, useEffect, useState } from 'react'; import { styled } from 'styled-components'; interface Props { @@ -58,8 +58,6 @@ export const Abbreviation = ({ setError(getErrorMessage(isDuplicate, containsSpace)); }, [isDuplicate, containsSpace, hasEmptyField]); - const buttonStyle: CSSProperties | undefined = showLabels ? { marginTop: '28px' } : undefined; - return (
@@ -96,7 +94,7 @@ export const Abbreviation = ({ loading={isSaving} title="Lagre forkortelse" disabled={isSaved || isDuplicate || containsSpace || isDeleting} - style={buttonStyle} + className={showLabels ? 'mt-7' : undefined} /> )} @@ -109,13 +107,13 @@ export const Abbreviation = ({ loading={isDeleting} disabled={(isDeleting ?? false) || isSaving} title="Slett forkortelse" - style={buttonStyle} + className={showLabels ? 'mt-7' : undefined} /> )} {error === undefined ? null : ( - + {error} )} diff --git a/frontend/src/components/smart-editor-texts/edit/draft-regelverk.tsx b/frontend/src/components/smart-editor-texts/edit/draft-regelverk.tsx index 14d0cbfef..41965fb29 100644 --- a/frontend/src/components/smart-editor-texts/edit/draft-regelverk.tsx +++ b/frontend/src/components/smart-editor-texts/edit/draft-regelverk.tsx @@ -51,7 +51,7 @@ export const DraftRegelverk = ({ text, onDraftDeleted }: Props) => { return ( - {error === null ? null : {error}} + {error === null ? null : {error}} { width="calc(210mm * var(--kabal-editor-scale) + var(--a-spacing-16))" minWidth="calc(210mm + var(--a-spacing-16))" data-textid={id} - style={{ color: 'var(--a-surface-subtle)' }} + className="text-(--a-surface-subtle)" > - + @@ -38,7 +38,7 @@ export const LoadText = () => { data-textid={id} style={{ [EDITOR_SCALE_CSS_VAR.toString()]: getScaleVar(ScalingGroup.REDAKTØR) }} > - + diff --git a/frontend/src/components/smart-editor-texts/edit/tags.tsx b/frontend/src/components/smart-editor-texts/edit/tags.tsx index f518ce547..82fb425ad 100644 --- a/frontend/src/components/smart-editor-texts/edit/tags.tsx +++ b/frontend/src/components/smart-editor-texts/edit/tags.tsx @@ -186,7 +186,7 @@ export const TagContainer = (props: { children: React.ReactNode }) => ( wrap align="center" flexGrow="0" - gridColumn="tags" + className="[grid-area:tags]" maxHeight="250px" overflowY="auto" flexShrink="0" diff --git a/frontend/src/components/smart-editor-texts/filtered-text-list.tsx b/frontend/src/components/smart-editor-texts/filtered-text-list.tsx index 00df86258..a97f6096c 100644 --- a/frontend/src/components/smart-editor-texts/filtered-text-list.tsx +++ b/frontend/src/components/smart-editor-texts/filtered-text-list.tsx @@ -20,7 +20,7 @@ export const FilteredTextList = ({ textType }: Props) => { const { data = [], isLoading } = useGetTextsQuery(textQuery); return ( - + diff --git a/frontend/src/components/smart-editor-texts/hjemler-select/popup.tsx b/frontend/src/components/smart-editor-texts/hjemler-select/popup.tsx index e183503f5..910eac04d 100644 --- a/frontend/src/components/smart-editor-texts/hjemler-select/popup.tsx +++ b/frontend/src/components/smart-editor-texts/hjemler-select/popup.tsx @@ -27,7 +27,7 @@ export const Popup = ({ isOpen, children }: PopupProps) => { maxWidth="275px" position="absolute" left="0" - style={{ top: '100%', zIndex: 22, scrollMarginBottom: 'var(--a-spacing-4)' }} + className="top-full z-22 scroll-mb-4" > {children} diff --git a/frontend/src/components/smart-editor-texts/smart-editor-texts.tsx b/frontend/src/components/smart-editor-texts/smart-editor-texts.tsx index e20bda48f..6f25874db 100644 --- a/frontend/src/components/smart-editor-texts/smart-editor-texts.tsx +++ b/frontend/src/components/smart-editor-texts/smart-editor-texts.tsx @@ -37,7 +37,7 @@ export const SmartEditorTexts = ({ textType }: Props) => { return ( - + diff --git a/frontend/src/components/smart-editor-texts/text-list/text-list.tsx b/frontend/src/components/smart-editor-texts/text-list/text-list.tsx index 14f391a73..5d6304ad3 100644 --- a/frontend/src/components/smart-editor-texts/text-list/text-list.tsx +++ b/frontend/src/components/smart-editor-texts/text-list/text-list.tsx @@ -75,11 +75,11 @@ export const StandaloneTextList = ({ filter, data, isLoading, style, textType }: return ( - + {sortedTexts.map(({ id, title, modified, publishedDateTime, published, score }) => ( - + {getTitle(title)} @@ -99,10 +99,10 @@ interface MaltekstseksjonListProps { filter: string; data: IMaltekstseksjon[]; isLoading: boolean; - style?: React.CSSProperties; + className?: string; } -export const MaltekstseksjonList = ({ filter, data, isLoading, style }: MaltekstseksjonListProps) => { +export const MaltekstseksjonList = ({ filter, data, isLoading, className }: MaltekstseksjonListProps) => { const [statusFilter] = useStatusFilter(); const sortedMaltekstseksjonList = useFilteredAndSorted( data, @@ -123,9 +123,9 @@ export const MaltekstseksjonList = ({ filter, data, isLoading, style }: Maltekst } return ( - + - + {sortedMaltekstseksjonList.map(({ id, score }) => ( ))} @@ -169,8 +169,8 @@ const MaltekstseksjonItem = ({ maltekstseksjonId, score }: MaltekstseksjonItemPr return ( - - + + {getTitle(title)} @@ -193,9 +193,9 @@ const Headers = () => { + - + } sortKey={SortKey.SCORE} querySortKey={sort} diff --git a/frontend/src/components/smart-editor-texts/utfall-set-filter/read-utfall-set.tsx b/frontend/src/components/smart-editor-texts/utfall-set-filter/read-utfall-set.tsx index 2a7dd41de..69f8b3e48 100644 --- a/frontend/src/components/smart-editor-texts/utfall-set-filter/read-utfall-set.tsx +++ b/frontend/src/components/smart-editor-texts/utfall-set-filter/read-utfall-set.tsx @@ -19,7 +19,7 @@ export const ReadUtfallSet = ({ utfallSet, onDelete, editUtfallSet }: ReadUtfall utfallSet.map((u) => ) )} - + diff --git a/frontend/src/plate/components/placeholder/placeholder.tsx b/frontend/src/plate/components/placeholder/placeholder.tsx index b05af4af6..9bdcb2edb 100644 --- a/frontend/src/plate/components/placeholder/placeholder.tsx +++ b/frontend/src/plate/components/placeholder/placeholder.tsx @@ -154,10 +154,7 @@ const Placeholder = ({ canManage, ...props }: PlaceholderProps) => { diff --git a/frontend/src/plate/components/plate-ui/table-cell-element.tsx b/frontend/src/plate/components/plate-ui/table-cell-element.tsx index 1092579ec..54277b691 100644 --- a/frontend/src/plate/components/plate-ui/table-cell-element.tsx +++ b/frontend/src/plate/components/plate-ui/table-cell-element.tsx @@ -21,7 +21,7 @@ export const TableCellElement = withRef(({ style, children, return ( - + {children} diff --git a/frontend/src/plate/components/plate-ui/table-row-element.tsx b/frontend/src/plate/components/plate-ui/table-row-element.tsx index 466c2a0c5..138d63413 100644 --- a/frontend/src/plate/components/plate-ui/table-row-element.tsx +++ b/frontend/src/plate/components/plate-ui/table-row-element.tsx @@ -2,7 +2,7 @@ import { PlateElement, withRef } from '@udecode/plate/react'; import { styled } from 'styled-components'; const TableRowElement = withRef(({ children, ...props }, ref) => ( - + {children} )); diff --git a/frontend/src/plate/components/regelverk.tsx b/frontend/src/plate/components/regelverk.tsx index 2ccfab60c..1e9ca5763 100644 --- a/frontend/src/plate/components/regelverk.tsx +++ b/frontend/src/plate/components/regelverk.tsx @@ -30,7 +30,7 @@ export const Regelverk = (props: PlateElementProps) => { {children} {canManage ? ( - + ) : null} diff --git a/frontend/src/plate/leaf/marks.tsx b/frontend/src/plate/leaf/marks.tsx index 315014081..2366a7be5 100644 --- a/frontend/src/plate/leaf/marks.tsx +++ b/frontend/src/plate/leaf/marks.tsx @@ -1,14 +1,8 @@ import type { FormattedText } from '@app/plate/types'; import { PlateLeaf, type PlateLeafProps } from '@udecode/plate/react'; -export const BoldLeaf = (props: PlateLeafProps) => ( - -); +export const BoldLeaf = (props: PlateLeafProps) => ; -export const ItalicLeaf = (props: PlateLeafProps) => ( - -); +export const ItalicLeaf = (props: PlateLeafProps) => ; -export const UnderlineLeaf = (props: PlateLeafProps) => ( - -); +export const UnderlineLeaf = (props: PlateLeafProps) => ; diff --git a/frontend/src/plate/plate-editor.tsx b/frontend/src/plate/plate-editor.tsx index e409435de..3889539e7 100644 --- a/frontend/src/plate/plate-editor.tsx +++ b/frontend/src/plate/plate-editor.tsx @@ -16,7 +16,7 @@ export const KabalPlateEditor = ({ className, spellCheck = true, readOnly = fals ( diff --git a/frontend/src/plate/status-bar/scaling.tsx b/frontend/src/plate/status-bar/scaling.tsx index e932da6bc..eee31b3b9 100644 --- a/frontend/src/plate/status-bar/scaling.tsx +++ b/frontend/src/plate/status-bar/scaling.tsx @@ -90,7 +90,7 @@ const ScaleSelector = ({ close }: ScaleSelectorProps) => { ); return ( - + {PRESETS.map((p) => ( diff --git a/frontend/src/plate/toolbar/abbreviation.tsx b/frontend/src/plate/toolbar/abbreviation.tsx index 12cfb27d0..7f8ca8b53 100644 --- a/frontend/src/plate/toolbar/abbreviation.tsx +++ b/frontend/src/plate/toolbar/abbreviation.tsx @@ -96,7 +96,7 @@ export const Abbreviation = () => { keys={['Ctrl', 'Shift', 'F']} /> {isOpen ? ( - + + ( - - + + {children} diff --git a/frontend/src/plate/toolbar/toolbars/floating-toolbar.tsx b/frontend/src/plate/toolbar/toolbars/floating-toolbar.tsx index 3e98e1bb4..0fbbdee52 100644 --- a/frontend/src/plate/toolbar/toolbars/floating-toolbar.tsx +++ b/frontend/src/plate/toolbar/toolbars/floating-toolbar.tsx @@ -46,8 +46,8 @@ const FloatingToolbar = ({ editorId, container, children }: FloatingToolbarProps asChild align="center" position="absolute" + className="z-21" style={{ - zIndex: 21, willChange: 'left, right, top', top: `calc(${position.top}em - ${OFFSET}px)`, left: horizontalPosition.left === undefined ? undefined : `${horizontalPosition.left}em`, diff --git a/frontend/src/plate/toolbar/toolbars/table-toolbar.tsx b/frontend/src/plate/toolbar/toolbars/table-toolbar.tsx index 8c3bdc9d3..6da364c3a 100644 --- a/frontend/src/plate/toolbar/toolbars/table-toolbar.tsx +++ b/frontend/src/plate/toolbar/toolbars/table-toolbar.tsx @@ -37,7 +37,7 @@ const TableToolbar = ({ editorId, container, children }: TableToolbarProps) => { const [top, left] = position; return ( - + {children}