From ae32253e176f48b7384a22cb9df11458320d6947 Mon Sep 17 00:00:00 2001 From: Ken <26967723+KenAJoh@users.noreply.github.com> Date: Mon, 8 May 2023 09:16:18 +0200 Subject: [PATCH 01/11] Byttet ut bruk av `ds-icons` med `aksel-icons` (#1961) --- .changeset/stupid-boats-approve.md | 19 +++++ @navikt/core/css/alert.css | 1 - @navikt/core/css/chips.css | 17 +++-- @navikt/core/css/date.css | 3 +- @navikt/core/css/form/search.css | 2 +- @navikt/core/css/form/select.css | 8 +- @navikt/core/css/form/switch.css | 4 +- @navikt/core/css/read-more.css | 30 ++++---- @navikt/core/css/stepper.css | 23 ++++++ @navikt/core/css/table.css | 13 ++-- @navikt/core/css/tabs.css | 2 +- @navikt/core/css/tokens.json | 2 +- @navikt/core/react/package.json | 1 - @navikt/core/react/src/alert/Alert.tsx | 18 ++--- .../core/react/src/button/button.stories.tsx | 16 ++-- @navikt/core/react/src/chips/Removable.tsx | 4 +- @navikt/core/react/src/chips/Toggle.tsx | 4 +- @navikt/core/react/src/date/DateInput.tsx | 4 +- .../src/date/datepicker/caption/Caption.tsx | 6 +- .../datepicker/caption/DropdownCaption.tsx | 6 +- .../src/date/monthpicker/MonthCaption.tsx | 6 +- @navikt/core/react/src/form/Select.tsx | 5 +- @navikt/core/react/src/form/Switch.tsx | 9 +-- @navikt/core/react/src/form/search/Search.tsx | 9 ++- .../react/src/form/search/SearchButton.tsx | 4 +- @navikt/core/react/src/help-text/HelpText.tsx | 9 +-- .../core/react/src/help-text/HelpTextIcon.tsx | 45 +++++++++++ .../core/react/src/link-panel/LinkPanel.tsx | 5 +- @navikt/core/react/src/link/link.stories.tsx | 12 +-- @navikt/core/react/src/list/list.stories.tsx | 18 ++--- @navikt/core/react/src/modal/Modal.tsx | 7 +- .../core/react/src/pagination/Pagination.tsx | 9 ++- @navikt/core/react/src/read-more/ReadMore.tsx | 25 ++++--- .../react/src/read-more/readmore.stories.tsx | 7 +- @navikt/core/react/src/stepper/Step.tsx | 9 +-- .../react/src/stepper/stepper.stories.tsx | 4 +- @navikt/core/react/src/table/ColumnHeader.tsx | 12 ++- .../core/react/src/table/ExpandableRow.tsx | 8 +- @navikt/core/react/src/tabs/TabList.tsx | 8 +- @navikt/core/react/src/tabs/Tabs.stories.tsx | 74 ++++++++++++------- .../src/toggle-group/ToggleGroup.stories.tsx | 19 +++-- @navikt/icons/README.md | 8 +- @navikt/internal/react/package.json | 2 +- .../src/copy-to-clipboard/CopyToClipboard.tsx | 4 +- .../copy-to-clipboard.stories.tsx | 6 +- .../react/src/header/HeaderUserButton.tsx | 11 +-- .../react/src/header/header.stories.tsx | 32 ++++---- .../react/src/timeline/timeline.stories.tsx | 73 +++++++++++++----- yarn.lock | 57 +++++++------- 49 files changed, 426 insertions(+), 254 deletions(-) create mode 100644 .changeset/stupid-boats-approve.md create mode 100644 @navikt/core/react/src/help-text/HelpTextIcon.tsx diff --git a/.changeset/stupid-boats-approve.md b/.changeset/stupid-boats-approve.md new file mode 100644 index 00000000000..530b12dcf92 --- /dev/null +++ b/.changeset/stupid-boats-approve.md @@ -0,0 +1,19 @@ +--- +"@navikt/ds-css": major +"@navikt/ds-react": major +"@navikt/ds-react-internal": major +--- + +Aksels løsninger bruker nå `@navikt/aksel-icons` + +**Sideffects:** + +- Komponenter som tidligere brukte Expand-ikon har fått oppdatert animasjon. +- Alert bruker samme ikonstørrelse for alle størrelser +- Chips har justert padding/ikonstørrelser +- Datepicker hover-bug på knapper er fikset +- Select har fått justert padding rundt ikon +- Switch bruker samme checkmark som checkbox, er nå også avrundet. +- ReadMore har justert margin for alignment med ikon, fjernet content-animasjon +- Stepper har endret hvordan den håndterer ✔️ -ikon. Hvis du har overskrevet stepper-CSS kan det hende dette må oppdateres lokalt også. +- Tabs bruker default text-default diff --git a/@navikt/core/css/alert.css b/@navikt/core/css/alert.css index 361b83abe63..893cd23337b 100644 --- a/@navikt/core/css/alert.css +++ b/@navikt/core/css/alert.css @@ -28,7 +28,6 @@ } .navds-alert--small > .navds-alert__icon { - font-size: 1.25rem; height: var(--a-font-line-height-large); } diff --git a/@navikt/core/css/chips.css b/@navikt/core/css/chips.css index 8c4884f0c80..4e4c3823e36 100644 --- a/@navikt/core/css/chips.css +++ b/@navikt/core/css/chips.css @@ -63,6 +63,10 @@ box-shadow: inset 0 0 0 1px var(--a-surface-default), 0 0 0 2px var(--ac-chip-toggle-focus, var(--a-border-focus)); } +.navds-chips__removable { + gap: 0; +} + .navds-chips__removable--action { background-color: var(--ac-chip-removable-action-bg, var(--a-surface-action-selected)); color: var(--ac-chip-removable-action-text, var(--a-text-on-action)); @@ -77,22 +81,23 @@ .navds-chips__removable-icon { width: 1.5rem; height: 1.5rem; + font-size: 1.25rem; display: grid; place-items: center; border-radius: var(--a-border-radius-full); } .navds-chips__toggle-icon { - width: 1.25rem; - height: 1.25rem; + width: 1.5rem; + height: 1.5rem; display: grid; place-items: center; border-radius: var(--a-border-radius-full); } .navds-chips--small .navds-chips__toggle-icon { - width: 1rem; - height: 1rem; + width: 1.25rem; + height: 1.25rem; } .navds-chips--small .navds-chips__removable-icon { @@ -101,7 +106,7 @@ } .navds-chips--small .navds-chips__removable-icon > svg { - width: 0.75rem; + width: 1rem; } .navds-chips__removable--action:focus-visible { @@ -126,7 +131,7 @@ } .navds-chips--icon-right { - padding-right: var(--a-spacing-1); + padding-right: 0.375rem; } .navds-chips--small .navds-chips--icon-right { diff --git a/@navikt/core/css/date.css b/@navikt/core/css/date.css index d808778a895..f8170bf4b85 100644 --- a/@navikt/core/css/date.css +++ b/@navikt/core/css/date.css @@ -164,7 +164,8 @@ } .navds-date__caption-button, -.navds-date__caption-button:disabled { +.navds-date__caption-button:disabled, +.navds-date__caption-button:disabled:hover { color: var(--ac-date-caption-text, var(--a-text-default)); } diff --git a/@navikt/core/css/form/search.css b/@navikt/core/css/form/search.css index 4e0e105aa15..0cc6e6d2034 100644 --- a/@navikt/core/css/form/search.css +++ b/@navikt/core/css/form/search.css @@ -72,7 +72,7 @@ cursor: pointer; background: none; border: none; - font-size: 1rem; + font-size: 1.25rem; padding: 0; } diff --git a/@navikt/core/css/form/select.css b/@navikt/core/css/form/select.css index f65de333dbb..5b43171fc99 100644 --- a/@navikt/core/css/form/select.css +++ b/@navikt/core/css/form/select.css @@ -31,8 +31,8 @@ .navds-select__chevron { position: absolute; - font-size: 1rem; - right: 0.5rem; + font-size: 1.5rem; + right: var(--a-spacing-2); pointer-events: none; align-self: center; } @@ -42,6 +42,10 @@ padding: 0 2rem 0 0.25rem; } +.navds-form-field--small .navds-select__chevron { + right: 0.375rem; +} + /** Error handling */ diff --git a/@navikt/core/css/form/switch.css b/@navikt/core/css/form/switch.css index 6e1146c2d1a..bc6b43559cb 100644 --- a/@navikt/core/css/form/switch.css +++ b/@navikt/core/css/form/switch.css @@ -76,7 +76,7 @@ position: absolute; top: var(--a-spacing-3); left: 0; - border-radius: var(--a-border-radius-medium); + border-radius: var(--a-border-radius-full); transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1); } @@ -118,7 +118,7 @@ .navds-switch__thumb { background-color: var(--ac-switch-thumb-bg, var(--a-surface-default)); color: var(--ac-switch-thumb-icon, var(--a-icon-subtle)); - border-radius: var(--a-border-radius-small); + border-radius: var(--a-border-radius-full); width: 20px; height: 20px; position: absolute; diff --git a/@navikt/core/css/read-more.css b/@navikt/core/css/read-more.css index fd5f8bc07f8..9050a257e54 100644 --- a/@navikt/core/css/read-more.css +++ b/@navikt/core/css/read-more.css @@ -32,32 +32,36 @@ .navds-read-more__content { margin-top: var(--a-spacing-1); border-left: 2px solid var(--ac-read-more-line, var(--a-border-divider)); + margin-left: 13px; + padding-left: 13px; +} + +.navds-read-more--small .navds-read-more__content { margin-left: 11px; padding-left: 11px; } +.navds-read-more__content--closed { + display: none; +} + .navds-read-more__expand-icon { - font-size: 1.25rem; - height: 1.5rem; + font-size: 1.5rem; flex-shrink: 0; } .navds-read-more--small .navds-read-more__expand-icon { - height: 1.25rem; -} - -.navds-read-more--open > .navds-read-more__button > .navds-read-more__expand-icon { - transform: rotate(-180deg); + font-size: 1.25rem; } -.navds-read-more__expand-icon--filled { - display: none; +.navds-read-more__button:hover > .navds-read-more__expand-icon { + transform: translateY(1px); } -.navds-read-more__button:hover > .navds-read-more__expand-icon.navds-read-more__expand-icon--filled { - display: inherit; +.navds-read-more--open > .navds-read-more__button > .navds-read-more__expand-icon { + transform: rotate(-180deg); } -.navds-read-more__button:hover > .navds-read-more__expand-icon { - display: none; +.navds-read-more--open > .navds-read-more__button:hover > .navds-read-more__expand-icon { + transform: translateY(-1px) rotate(-180deg); } diff --git a/@navikt/core/css/stepper.css b/@navikt/core/css/stepper.css index 46c35b1f038..eb7c9cded70 100644 --- a/@navikt/core/css/stepper.css +++ b/@navikt/core/css/stepper.css @@ -102,6 +102,8 @@ button.navds-stepper__step { border: none; background: none; font-size: 28px; + color: var(--a-text-on-action); + background-color: var(--ac-stepper-text, var(--a-surface-action)); } .navds-stepper__content { @@ -189,6 +191,11 @@ button.navds-stepper__step { background-color: var(--ac-stepper-hover-bg, var(--a-surface-action-subtle-hover)); } +:where(.navds-stepper__step:not(.navds-stepper__step--active):hover) .navds-stepper__circle--success { + color: var(--ac-stepper-hover-bg, var(--a-surface-action-subtle-hover)); + background-color: var(--ac-stepper-text, var(--a-surface-action)); +} + /* Non-interactive */ :where(.navds-stepper__step--non-interactive.navds-stepper__step--active) .navds-stepper__content { color: var(--ac-stepper-non-interactive-active, var(--a-text-default)); @@ -217,6 +224,22 @@ button.navds-stepper__step { color: var(--ac-stepper-active-completed, var(--a-text-action-selected)); } +:where(.navds-stepper__step--completed.navds-stepper__step--active) .navds-stepper__circle--success { + color: var(--a-text-on-action); + background-color: var(--ac-stepper-active-completed, var(--a-surface-action-selected)); +} + +:where(.navds-stepper__step--non-interactive, .navds-stepper__step--non-interactive:hover, .navds-stepper__step--non-interactive.navds-stepper__step--active) + .navds-stepper__circle--success { + color: var(--a-text-on-inverted); + background-color: var(--ac-stepper-non-interactive-active-completed, var(--a-surface-inverted)); +} + :where(.navds-stepper__step--completed.navds-stepper__step--active.navds-stepper__step--non-interactive) .navds-stepper__circle { color: var(--ac-stepper-non-interactive-active-completed, var(--a-text-default)); } + +:where(.navds-stepper__step--completed.navds-stepper__step--active.navds-stepper__step--non-interactive) + .navds-stepper__circle--success { + color: var(--ac-stepper-non-interactive-active-completed, var(--a-text-on-inverted)); +} diff --git a/@navikt/core/css/table.css b/@navikt/core/css/table.css index f22e3a46173..4f36b553a60 100644 --- a/@navikt/core/css/table.css +++ b/@navikt/core/css/table.css @@ -193,19 +193,18 @@ font-size: 1.25rem; } -.navds-table__toggle-expand-button:hover .navds-table__expandable-icon, -.navds-table__expandable-icon--filled { - display: none; -} - -.navds-table__toggle-expand-button:hover .navds-table__expandable-icon--filled { - display: block; +.navds-table__toggle-expand-button:hover .navds-table__expandable-icon { + transform: translateY(1px); } .navds-table__toggle-expand-cell--open .navds-table__expandable-icon { transform: rotate(180deg); } +.navds-table__toggle-expand-cell--open .navds-table__toggle-expand-button:hover .navds-table__expandable-icon { + transform: translateY(-1px) rotate(180deg); +} + .navds-table__expanded-row-cell { padding: 0; } diff --git a/@navikt/core/css/tabs.css b/@navikt/core/css/tabs.css index c1ca83b45f7..bc2cbb6b624 100644 --- a/@navikt/core/css/tabs.css +++ b/@navikt/core/css/tabs.css @@ -49,7 +49,7 @@ align-items: center; background: none; border: none; - color: var(--ac-tabs-text, var(--a-text-subtle)); + color: var(--ac-tabs-text, var(--a-text-default)); cursor: pointer; } diff --git a/@navikt/core/css/tokens.json b/@navikt/core/css/tokens.json index 4147421256d..aacde5ffc1c 100644 --- a/@navikt/core/css/tokens.json +++ b/@navikt/core/css/tokens.json @@ -226,7 +226,7 @@ }, "tabs": { "--ac-tabs-border": "--a-border-divider", - "--ac-tabs-text": "--a-text-subtle", + "--ac-tabs-text": "--a-text-default", "--ac-tabs-hover-border": "--a-border-subtle-hover", "--ac-tabs-selected-border": "--a-border-action", "--ac-tabs-selected-text": "--a-text-default", diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 86ea971995b..7970983770d 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -39,7 +39,6 @@ "dependencies": { "@floating-ui/react": "0.17.0", "@navikt/aksel-icons": "^2.9.8", - "@navikt/ds-icons": "^2.9.8", "@radix-ui/react-tabs": "1.0.0", "@radix-ui/react-toggle-group": "1.0.0", "clsx": "^1.2.1", diff --git a/@navikt/core/react/src/alert/Alert.tsx b/@navikt/core/react/src/alert/Alert.tsx index 4b4e2621a4c..7e9425e008c 100644 --- a/@navikt/core/react/src/alert/Alert.tsx +++ b/@navikt/core/react/src/alert/Alert.tsx @@ -1,9 +1,9 @@ import { - ErrorFilled, - InformationFilled, - SuccessFilled, - WarningFilled, -} from "@navikt/ds-icons"; + InformationSquareFillIcon, + CheckmarkCircleFillIcon, + ExclamationmarkTriangleFillIcon, + XMarkOctagonFillIcon, +} from "@navikt/aksel-icons"; import cl from "clsx"; import React, { forwardRef } from "react"; import { BodyLong } from "../typography/BodyLong"; @@ -37,13 +37,13 @@ export interface AlertProps extends React.HTMLAttributes { const Icon = ({ variant, ...props }) => { switch (variant) { case "error": - return ; + return ; case "warning": - return ; + return ; case "info": - return ; + return ; case "success": - return ; + return ; default: return null; } diff --git a/@navikt/core/react/src/button/button.stories.tsx b/@navikt/core/react/src/button/button.stories.tsx index 67f429d79a8..b760aff0fc9 100644 --- a/@navikt/core/react/src/button/button.stories.tsx +++ b/@navikt/core/react/src/button/button.stories.tsx @@ -1,4 +1,4 @@ -import { Star } from "@navikt/ds-icons"; +import { StarIcon } from "@navikt/aksel-icons"; import React from "react"; import { Button } from "./index"; @@ -45,7 +45,7 @@ export const Default = { variant={props.variant} size={props.size} loading={props.loading} - icon={props.icon ? : undefined} + icon={props.icon ? : undefined} iconPosition={props.iconPosition} > {props.children} @@ -159,7 +159,7 @@ export const Icon = () => ( )} diff --git a/@navikt/core/react/src/form/search/SearchButton.tsx b/@navikt/core/react/src/form/search/SearchButton.tsx index 61da451c430..59dce601da0 100644 --- a/@navikt/core/react/src/form/search/SearchButton.tsx +++ b/@navikt/core/react/src/form/search/SearchButton.tsx @@ -1,8 +1,8 @@ -import { Search } from "@navikt/ds-icons"; import cl from "clsx"; import React, { forwardRef, useContext } from "react"; import { Button, ButtonProps } from "../.."; import { SearchContext } from "./Search"; +import { MagnifyingGlassIcon } from "@navikt/aksel-icons"; export interface SearchButtonProps extends Omit { @@ -41,7 +41,7 @@ const SearchButton: SearchButtonType = forwardRef( onClick?.(e); }} icon={ - } diff --git a/@navikt/core/react/src/help-text/HelpText.tsx b/@navikt/core/react/src/help-text/HelpText.tsx index 88065aacaea..1a7a3c27d1a 100644 --- a/@navikt/core/react/src/help-text/HelpText.tsx +++ b/@navikt/core/react/src/help-text/HelpText.tsx @@ -1,7 +1,7 @@ -import { Helptext as HelpTextIcon, HelptextFilled } from "@navikt/ds-icons"; import cl from "clsx"; import React, { forwardRef, useMemo, useRef, useState } from "react"; import { Popover, PopoverProps, mergeRefs } from ".."; +import { HelpTextIcon } from "./HelpTextIcon"; export interface HelpTextProps extends React.ButtonHTMLAttributes, @@ -61,11 +61,8 @@ export const HelpText = forwardRef( type="button" aria-expanded={open} > - - + + setOpen(false)} diff --git a/@navikt/core/react/src/help-text/HelpTextIcon.tsx b/@navikt/core/react/src/help-text/HelpTextIcon.tsx new file mode 100644 index 00000000000..f9770a614b2 --- /dev/null +++ b/@navikt/core/react/src/help-text/HelpTextIcon.tsx @@ -0,0 +1,45 @@ +import cl from "clsx"; +import React from "react"; +import { useId } from "../util/useId"; + +export const HelpTextIcon = ({ + title, + filled = false, +}: { + title: string; + filled?: boolean; +}) => { + let titleId: string | undefined = useId(); + titleId = title ? `title-${titleId}` : undefined; + return ( + + {title ? {title} : null} + + + + ); +}; diff --git a/@navikt/core/react/src/link-panel/LinkPanel.tsx b/@navikt/core/react/src/link-panel/LinkPanel.tsx index 04eb6d7ddb1..7cf984b6247 100644 --- a/@navikt/core/react/src/link-panel/LinkPanel.tsx +++ b/@navikt/core/react/src/link-panel/LinkPanel.tsx @@ -1,12 +1,13 @@ import React, { forwardRef } from "react"; import { Panel, OverridableComponent } from ".."; -import { Next } from "@navikt/ds-icons"; + import cl from "clsx"; import { LinkPanelTitle, LinkPanelTitleType } from "./LinkPanelTitle"; import { LinkPanelDescription, LinkPanelDescriptionType, } from "./LinkPanelDescription"; +import { ChevronRightIcon } from "@navikt/aksel-icons"; export interface LinkPanelProps extends React.AnchorHTMLAttributes { @@ -41,7 +42,7 @@ export const LinkPanelComponent: OverridableComponent< className={cl("navds-link-panel", className)} >
{children}
- + ); } diff --git a/@navikt/core/react/src/link/link.stories.tsx b/@navikt/core/react/src/link/link.stories.tsx index 8dc0e298308..d72194d6125 100644 --- a/@navikt/core/react/src/link/link.stories.tsx +++ b/@navikt/core/react/src/link/link.stories.tsx @@ -1,10 +1,10 @@ -import { Add } from "@navikt/ds-icons"; +import { PlusCircleFillIcon } from "@navikt/aksel-icons"; import React from "react"; import { + BodyLong, + Alert as DsAlert, ConfirmationPanel as DsConfirmationPanel, Link, - Alert as DsAlert, - BodyLong, } from ".."; export default { title: "ds-react/Link", @@ -15,7 +15,8 @@ export const Default = { render: (props) => { const LinkD = () => ( - {props.icon && }Ex aliqua incididunt {props.icon && } + {props.icon && }Ex aliqua incididunt{" "} + {props.icon && } ); @@ -41,7 +42,8 @@ export const Default = { const DemoLink = () => ( - Ex aliqua incididunt + Ex aliqua incididunt{" "} + ); diff --git a/@navikt/core/react/src/list/list.stories.tsx b/@navikt/core/react/src/list/list.stories.tsx index c22822e7332..e9b05d57ac4 100644 --- a/@navikt/core/react/src/list/list.stories.tsx +++ b/@navikt/core/react/src/list/list.stories.tsx @@ -1,9 +1,9 @@ import { - BabyChangingRoom, - Braille, - Cognition, - Refresh, -} from "@navikt/ds-icons"; + BabyWrappedIcon, + BrailleIcon, + HeadHeartIcon, + RecycleIcon, +} from "@navikt/aksel-icons"; import { Meta } from "@storybook/react"; import React from "react"; import { List } from ".."; @@ -97,20 +97,20 @@ export const Icons = { } + icon={} > Beskrivelsen på punkter er nærmere forklart her } + icon={} > Beskrivelsen på punkter er nærmere forklart her - }> + }> Beskrivelsen på punkter er nærmere forklart her - }> + }> Beskrivelsen på punkter er nærmere forklart her diff --git a/@navikt/core/react/src/modal/Modal.tsx b/@navikt/core/react/src/modal/Modal.tsx index 8e6f7da2808..9f9e8b8f9d4 100644 --- a/@navikt/core/react/src/modal/Modal.tsx +++ b/@navikt/core/react/src/modal/Modal.tsx @@ -1,9 +1,10 @@ import React, { forwardRef, useEffect, useMemo, useRef } from "react"; import cl from "clsx"; import ReactModal from "react-modal"; -import { Close } from "@navikt/ds-icons"; + import { Button, mergeRefs, useProvider } from ".."; import ModalContent, { ModalContentType } from "./ModalContent"; +import { XMarkIcon } from "@navikt/aksel-icons"; export interface ModalProps { /** @@ -144,10 +145,10 @@ export const Modal = forwardRef( "navds-modal__button--shake": shouldCloseOnOverlayClick, })} size="small" - variant="tertiary" + variant="tertiary-neutral" ref={buttonRef} onClick={onClose} - icon={} + icon={} /> )} diff --git a/@navikt/core/react/src/pagination/Pagination.tsx b/@navikt/core/react/src/pagination/Pagination.tsx index c58721b5a08..747f93c2b88 100644 --- a/@navikt/core/react/src/pagination/Pagination.tsx +++ b/@navikt/core/react/src/pagination/Pagination.tsx @@ -1,6 +1,7 @@ -import React, { forwardRef } from "react"; import cl from "clsx"; -import { Back, Next } from "@navikt/ds-icons"; +import React, { forwardRef } from "react"; + +import { ChevronLeftIcon, ChevronRightIcon } from "@navikt/aksel-icons"; import { BodyShort } from ".."; import PaginationItem, { PaginationItemProps, @@ -145,7 +146,7 @@ export const Pagination = forwardRef( page={page - 1} size={size} icon={ - ( page={page + 1} size={size} icon={ - { @@ -74,18 +72,23 @@ export const ReadMore = forwardRef( }} aria-expanded={isOpened} > - - {header} - - - {children} - - + + + {children} + ); } diff --git a/@navikt/core/react/src/read-more/readmore.stories.tsx b/@navikt/core/react/src/read-more/readmore.stories.tsx index 5996b3b8008..a40c311f8ac 100644 --- a/@navikt/core/react/src/read-more/readmore.stories.tsx +++ b/@navikt/core/react/src/read-more/readmore.stories.tsx @@ -26,8 +26,11 @@ export const Default = { header="Grunnen til at vi spør om dette og i tillegg ber om vedlegg" size={props.size} > - Command station, this is ST 321. Code Clearance Blue. We're starting our - approach. Deactivate the security shield. +
+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Mollitia, + tempore corporis exercitationem minus dignissimos eius aspernatur + fugiat iusto. +
); }, diff --git a/@navikt/core/react/src/stepper/Step.tsx b/@navikt/core/react/src/stepper/Step.tsx index 4fc5121673f..b67803e7b93 100644 --- a/@navikt/core/react/src/stepper/Step.tsx +++ b/@navikt/core/react/src/stepper/Step.tsx @@ -1,4 +1,4 @@ -import { SuccessFilled } from "@navikt/ds-icons"; +import { CheckmarkIcon } from "@navikt/aksel-icons"; import cl from "clsx"; import React, { forwardRef, useContext } from "react"; import { Label, OverridableComponent } from ".."; @@ -74,10 +74,9 @@ export const StepComponent: OverridableComponent< }} > {completed ? ( - + + + ) : (