Skip to content

Commit

Permalink
💄 Bytter ut PadlockUnlockedIcon med XMarkIcon
Browse files Browse the repository at this point in the history
Co-authored-by: Elias Andreassen Thøgersen <[email protected]>
  • Loading branch information
trinelinderud and elitho committed Dec 12, 2024
1 parent 6fdaaa7 commit 510af63
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { PadlockUnlockedIcon, PersonPencilIcon } from '@navikt/aksel-icons';
import { PersonPencilIcon, XMarkIcon } from '@navikt/aksel-icons';
import { Button, HelpText } from '@navikt/ds-react';

import { ArbeidsgiverFragment, Maybe, PersonFragment, Utbetalingstatus } from '@io/graphql';
Expand Down Expand Up @@ -55,7 +55,7 @@ export const ToggleOverstyring = ({
{erRevurdering ? 'Revurder' : 'Endre'}
</Button>
) : (
<Button onClick={() => setEditing(false)} size="xsmall" variant="tertiary" icon={<PadlockUnlockedIcon />}>
<Button onClick={() => setEditing(false)} size="xsmall" variant="tertiary" icon={<XMarkIcon />}>
Avbryt
</Button>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { PadlockUnlockedIcon, PersonPencilFillIcon, PersonPencilIcon } from '@navikt/aksel-icons';
import { PersonPencilFillIcon, PersonPencilIcon, XMarkIcon } from '@navikt/aksel-icons';
import { BodyShort, Button, ErrorMessage } from '@navikt/ds-react';

import { Endringstrekant } from '@components/Endringstrekant';
Expand Down Expand Up @@ -86,7 +86,7 @@ export const SkjønnsfastsettingHeader = ({
onClick={() => setEditing(false)}
size="xsmall"
variant="tertiary"
icon={<PadlockUnlockedIcon />}
icon={<XMarkIcon />}
className={styles.redigeringsknapp}
style={{ marginRight: '1rem' }}
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import { PadlockUnlockedIcon, PersonPencilIcon } from '@navikt/aksel-icons';
import { PersonPencilIcon, XMarkIcon } from '@navikt/aksel-icons';
import { BodyShort, Box, Button, CopyButton, HStack, Tooltip } from '@navikt/ds-react';

import { Kilde } from '@components/Kilde';
Expand Down Expand Up @@ -57,12 +57,7 @@ export const TilkommenAGHeader = ({ person, arbeidsgiver, periode, editing, setE
Endre
</Button>
) : (
<Button
onClick={() => setEditing(false)}
size="xsmall"
variant="tertiary"
icon={<PadlockUnlockedIcon />}
>
<Button onClick={() => setEditing(false)} size="xsmall" variant="tertiary" icon={<XMarkIcon />}>
Avbryt
</Button>
))}
Expand Down
4 changes: 2 additions & 2 deletions src/routes/saksbilde/utbetaling/OverstyringToolBar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react';

import { PadlockUnlockedIcon } from '@navikt/aksel-icons';
import { XMarkIcon } from '@navikt/aksel-icons';
import { Box, Button, HStack, Heading, VStack } from '@navikt/ds-react';

import { LeggTilDagerForm } from '@saksbilde/utbetaling/utbetalingstabell/LeggTilDager';
Expand Down Expand Up @@ -33,7 +33,7 @@ export const OverstyringToolBar = ({
<Button
size="xsmall"
variant="tertiary"
icon={<PadlockUnlockedIcon fontSize="1.5rem" />}
icon={<XMarkIcon />}
onClick={() => {
toggleOverstyring();
setVisLeggTilDagerForm(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
useFormContext,
} from 'react-hook-form';

import { PadlockUnlockedIcon } from '@navikt/aksel-icons';
import { XMarkIcon } from '@navikt/aksel-icons';
import { BodyShort, Box, Button, ErrorMessage, HStack, Heading, Table, Textarea, VStack } from '@navikt/ds-react';

import { Feiloppsummering, Skjemafeil } from '@components/Feiloppsummering';
Expand Down Expand Up @@ -89,7 +89,7 @@ export const MinimumSykdomsgradForm = ({
<Button
size="xsmall"
variant="tertiary"
icon={<PadlockUnlockedIcon />}
icon={<XMarkIcon />}
onClick={() => setOverstyrerMinimumSykdomsgrad(false)}
>
Avbryt
Expand Down

0 comments on commit 510af63

Please sign in to comment.