Skip to content

Commit

Permalink
fix(Accordion): rename to details
Browse files Browse the repository at this point in the history
  • Loading branch information
eirikbacker committed Nov 22, 2024
1 parent 8d97779 commit af3ead9
Show file tree
Hide file tree
Showing 25 changed files with 548 additions and 553 deletions.
16 changes: 8 additions & 8 deletions apps/_components/src/ColorModal/ColorModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,25 +97,25 @@ export const ColorModal = ({
</div>
<div className={classes.right} style={{ backgroundColor: hex }}></div>
</div>
{/* <Accordion.Root
{/* <Details.Root
color='neutral'
className={classes.accordion}
>
<Accordion.Item>
<Accordion.Heading
<Details.Item>
<Details.Summary
level={3}
className={classes.accordionHeading}
>
Vis kontrastgrenser mot relevante farger
</Accordion.Heading>
<Accordion.Content className={classes.accordionContent}>
</Details.Summary>
<Details.Content className={classes.accordionContent}>
<Boxes
selectedColor={hex}
colorTheme={namespace}
/>
</Accordion.Content>
</Accordion.Item>
</Accordion.Root> */}
</Details.Content>
</Details.Item>
</Details.Root> */}
</Modal.Block>
</Modal>
);
Expand Down
42 changes: 21 additions & 21 deletions apps/_components/src/Showcase/Showcase.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use client';
import {
Accordion,
Avatar,
Button,
Card,
Checkbox,
Combobox,
Details,
Divider,
Fieldset,
Heading,
Expand Down Expand Up @@ -280,40 +280,40 @@ export function Showcase({ className, ...props }: ShowcaseProps) {
</div>
<div className={cl(classes.card, classes.faq)}>
<Heading className={classes.cardTitle}>Ofte stillte spørsmål</Heading>
<Accordion data-color='brand3' border>
<Accordion.Item>
<Accordion.Heading>
<Details data-color='brand3' border>
<Details.Item>
<Details.Summary>
Hvem kan registrere seg i Frivillighetsregisteret?
</Accordion.Heading>
<Accordion.Content>
</Details.Summary>
<Details.Content>
For å kunne bli registrert i Frivillighetsregisteret, må
organisasjonen drive frivillig virksomhet. Det er bare foreninger,
stiftelser og aksjeselskap som kan registreres. Virksomheten kan
ikke dele ut midler til fysiske personer. Virksomheten må ha et
styre.
</Accordion.Content>
</Accordion.Item>
<Accordion.Item>
<Accordion.Heading>
</Details.Content>
</Details.Item>
<Details.Item>
<Details.Summary>
Hvordan går jeg fram for å registrere i Frivillighetsregisteret?
</Accordion.Heading>
<Accordion.Content>
</Details.Summary>
<Details.Content>
Virksomheten må være registrert i Enhetsregisteret før den kan bli
registrert i Frivillighetsregisteret. Du kan registrere i begge
registrene samtidig i Samordnet registermelding.
</Accordion.Content>
</Accordion.Item>
<Accordion.Item>
<Accordion.Heading>
</Details.Content>
</Details.Item>
<Details.Item>
<Details.Summary>
Hvordan går jeg fram for å registrere i Frivillighetsregisteret?
</Accordion.Heading>
<Accordion.Content>
</Details.Summary>
<Details.Content>
Virksomheten må være registrert i Enhetsregisteret før den kan bli
registrert i Frivillighetsregisteret. Du kan registrere i begge
registrene samtidig i Samordnet registermelding.
</Accordion.Content>
</Accordion.Item>
</Accordion>
</Details.Content>
</Details.Item>
</Details>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/storefront/app/bloggen/2024/v1rc1/page.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Denne installerer alle tre pakken, og inneholder tokens, CSS og React komponente
Denne kan legges hvor som helst, og endrer alle barn til modusen du har valgt.

<CodeSnippet language='ts'>
{`<Accordion data-color-scheme='dark'>...</Accordion>`}
{`<Details data-color-scheme='dark'>...</Details>`}
</CodeSnippet>

#### Design-tokens templat
Expand Down
6 changes: 3 additions & 3 deletions apps/storefront/app/komponenter/component-list.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export const data = [
{
title: 'Accordion',
image: 'Accordion.svg',
url: 'https://storybook.designsystemet.no/?path=/docs/komponenter-accordion--docs',
title: 'Details',
image: 'Details.svg',
url: 'https://storybook.designsystemet.no/?path=/docs/komponenter-details--docs',
},
{
title: 'Alert',
Expand Down
22 changes: 11 additions & 11 deletions apps/storefront/app/monstre/feilmeldinger/page.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {
CardContent,
Heading,
Paragraph,
Accordion,
AccordionItem,
AccordionContent,
AccordionHeading
Details,
DetailsItem,
DetailsContent,
DetailsSummary
} from '@digdir/designsystemet-react';

import { Image } from '@components';
Expand Down Expand Up @@ -184,12 +184,12 @@ Her må vi gjøre det så tydelig som mulig for brukeren at flere felt påvirker

I dette eksempelet har vi en gruppe med felt, der brukeren ikke nødvendigvis har alle opplysningene, men må fylle ut minst ett felt.

<Accordion
<Details
color='neutral'
>
<AccordionItem>
<AccordionHeading>Eksempel på feilmelding som gjelder flere felt</AccordionHeading>
<AccordionContent
<DetailsItem>
<DetailsSummary>Eksempel på feilmelding som gjelder flere felt</DetailsSummary>
<DetailsContent
style={{
paddingTop: '0px',
paddingBottom: '0px',
Expand All @@ -215,9 +215,9 @@ I dette eksempelet har vi en gruppe med felt, der brukeren ikke nødvendigvis ha
alt='Skjermbilde av skjema med en gruppe av felter. Brukeren har fylt ut minst ett felt, men har en feil i utfyllingen. Feilmeldingen vises da på vanlig måte under det aktuelle feltet. '
boxShadow={false}
/>
</AccordionContent>
</AccordionItem>
</Accordion>
</DetailsContent>
</DetailsItem>
</Details>

## Kode

Expand Down
4 changes: 2 additions & 2 deletions apps/storefront/components/MdxContent/MdxContent.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

& :not([data-unstyled]) {
&:is(p, h2, h3, h4, ul, ol),
&[class~='ds-accordion'],
&[class~='ds-accordion'] /* TODO: EIRIK */,
&[class~='ds-card'] {
max-width: 740px;
}
Expand All @@ -175,7 +175,7 @@
& h4,
& ul,
& ol,
& [class~='ds-accordion'],
& [class~='ds-accordion'] /* TODO: EIRIK */,
& [class~='ds-card'] {
max-width: unset;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/migrations/beta-to-v1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default (glob?: string) =>
}),
// New component token prefixes
cssVarRename({
'--fds-accordion': '--dsc-accordion',
'--fds-accordion': '--dsc-accordion', /* TODO: EIRIK */
'--fds-alert': '--dsc-alert',
'--fds-btn': '--dsc-btn',
'--fds-checkbox': '--dsc-checkbox',
Expand Down
129 changes: 0 additions & 129 deletions packages/css/src/accordion.css

This file was deleted.

Loading

0 comments on commit af3ead9

Please sign in to comment.