Skip to content

Commit 6e74f0f

Browse files
authored
feat(css): add theme package to @digdir/designsystemet-css (#4328)
1 parent 47082c5 commit 6e74f0f

15 files changed

Lines changed: 45 additions & 43 deletions

File tree

.changeset/weak-coats-love.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@digdir/designsystemet-css": patch
3+
---
4+
5+
Add export for a default theme under `/theme`.
6+
If you are using the default theme from `@digdir/designsystemet-theme`, we recommend importing the CSS from `@digdir/designsystemet-css/theme.css` and removing `@digdir/designsystemet-theme` from your dependencies.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Our goal is to create consistent and user-friendly experiences in digital soluti
2828

2929
[`@digdir/designsystemet`](https://www.npmjs.com/package/@digdir/designsystemet) - CLI for Designsystemet.
3030

31-
[`@digdir/designsystemet-css`](https://www.npmjs.com/package/@digdir/designsystemet-css) - CSS implementation of Designsystemet components. Used by the React package.
31+
[`@digdir/designsystemet-css`](https://www.npmjs.com/package/@digdir/designsystemet-css) - CSS implementation of Designsystemet components. Used by the React package. Contains a default theme.
3232

3333
[`@digdir/designsystemet-react`](https://www.npmjs.com/package/@digdir/designsystemet-react) - React implementation of Designsystemet components.
3434

apps/storybook/stories/get-started.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Følg disse stegene for å komme i gang med React-komponentene.
99
## 1. Installer pakkene
1010

1111
```sh
12-
npm i @digdir/designsystemet-react @digdir/designsystemet-theme @digdir/designsystemet-css
12+
npm i @digdir/designsystemet-react @digdir/designsystemet-css
1313
```
1414

1515
### Typescript
@@ -62,12 +62,12 @@ Designsystemet bruker [popover](https://developer.mozilla.org/en-US/docs/Web/HTM
6262
## 4. Bruk en React-komponent
6363

6464
```jsx
65-
import '@digdir/designsystemet-theme';
6665
import '@digdir/designsystemet-css';
66+
import '@digdir/designsystemet-css/theme';
6767

6868
import { Button } from '@digdir/designsystemet-react';
6969

7070
<Button variant='secondary'>Jeg er en knapp!</Button>;
7171
```
7272

73-
`@digdir/designsystemet-theme` og `@digdir/designsystemet-css` må kun importeres én gang i applikasjonen.
73+
`@digdir/designsystemet-css` og `@digdir/designsystemet-css/theme` må kun importeres én gang i applikasjonen.

apps/www/app/content/components-docs/en/get-started/css.mdx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ sidebar_title: CSS
44
order: 50
55
---
66

7-
If you don't [create your own theme](/en/fundamentals/themebuilder/own-theme) you must also install `@digdir/designsystemet-theme`.
8-
You can easily create your own theme later.
9-
107
### Layers
118

129
We use [css layers](https://developer.mozilla.org/en-US/docs/Web/CSS/@layer) to get the lowest possible specificity in our css.

apps/www/app/content/components-docs/en/get-started/react.mdx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ It is recommended that you also read about [CSS](/en/components/get-started/css)
1313
npm i @digdir/designsystemet-react @digdir/designsystemet-css
1414
```
1515

16-
If you are not [creating your own theme](/en/fundamentals/themebuilder/own-theme) you must also install `@digdir/designsystemet-theme`.
16+
If you are not [creating your own theme](/en/fundamentals/themebuilder/own-theme) you can get a default theme from `@digdir/designsystemet-css/theme`.
1717
You can easily create your own theme later.
1818

19-
```sh
20-
npm i @digdir/designsystemet-theme
21-
```
22-
2319
### Typescript
2420

2521
If you are using Typescript, make sure you have typescript >= 3.8 and install `@digdir/designsystemet-types`:
@@ -65,15 +61,15 @@ body {
6561
## 3. Use a React component
6662

6763
```tsx
68-
import '@digdir/designsystemet-theme'; /* or your theme */
6964
import '@digdir/designsystemet-css'; /* imported only once */
65+
import '@digdir/designsystemet-css/theme'; /* or your theme */
7066

7167
import { Button } from '@digdir/designsystemet-react';
7268

7369
<Button variant='secondary'>I'm a button!</Button>;
7470
```
7571

76-
`@digdir/designsystemet-theme` and `@digdir/designsystemet-css` must only be imported once in the application.
72+
`@digdir/designsystemet-css` and `@digdir/designsystemet-css/theme` must only be imported once in the application.
7773

7874
## Extras
7975

apps/www/app/content/components-docs/en/get-started/without-react.mdx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ You will not get all the benefits that the React components give you, but you ca
1111

1212
## Get started
1313

14-
To use the Designsystemet CSS, you need to install `@digdir/designsystemet-css`. You can also install `@digdir/designsystemet-theme`, or [create your own theme](/en/fundamentals/themebuilder/own-theme). You can easily create your own theme later.
14+
To use the Designsystemet CSS, you need to install `@digdir/designsystemet-css`. You can use the default theme from `@digdir/designsystemet-css/theme`, or [create your own theme](/en/fundamentals/themebuilder/own-theme). You can easily create your own theme later.
1515

1616
```sh
17-
npm i @digdir/designsystemet-css @digdir/designsystemet-theme
17+
npm i @digdir/designsystemet-css
1818
```
1919

2020
### Add CSS to your project
@@ -24,15 +24,15 @@ You can import the CSS files directly into your main CSS file, or add them as `<
2424
#### Import in CSS file
2525

2626
```css
27-
@import '@digdir/designsystemet-theme/index.css';
2827
@import '@digdir/designsystemet-css/index.css';
28+
@import '@digdir/designsystemet-css/theme.css';
2929
```
3030

3131
#### Add as `<link>` tags
3232

3333
```html
34-
<link rel="stylesheet" href="path/to/node_modules/@digdir/designsystemet-theme/index.css" />
35-
<link rel="stylesheet" href="path/to/node_modules/@digdir/designsystemet-css/index.css" />
34+
<link rel="stylesheet" href="path/to/node_modules/@digdir/designsystemet-css/dist/theme/designsystemet.css" />
35+
<link rel="stylesheet" href="path/to/node_modules/@digdir/designsystemet-css/dist/src/index.css" />
3636
```
3737

3838
## Get started

apps/www/app/content/components-docs/no/get-started/css.mdx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ sidebar_title: CSS
44
order: 60
55
---
66

7-
Dersom du ikke [lager ditt eget tema](/no/fundamentals/themebuilder/own-theme) må du også intallere `@digdir/designsystemet-theme`.
8-
Du kan lett lage ditt eget tema senere.
9-
107
### Layers
118

129
Vi bruker [css layers](https://developer.mozilla.org/en-US/docs/Web/CSS/@layer) for å få lavest mulig spesifisitet på vår css.

apps/www/app/content/components-docs/no/get-started/react.mdx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ Det anbefales at du også leser om [CSS](/no/components/get-started/css).
1313
npm i @digdir/designsystemet-react @digdir/designsystemet-css
1414
```
1515

16-
Dersom du ikke [lager ditt eget tema](/no/fundamentals/themebuilder/own-theme) du også intallere `@digdir/designsystemet-theme`.
16+
Dersom du ikke [lager ditt eget tema](/no/fundamentals/themebuilder/own-theme) kan du bruke et standardtema fra `@digdir/designsystemet-css/theme`.
1717
Du kan lett lage ditt eget tema senere.
1818

19-
```sh
20-
npm i @digdir/designsystemet-theme
21-
```
22-
2319
### Typescript
2420

2521
Dersom du bruker Typescript, sørg for at du har typescript >= 3.8 og installerer `@digdir/designsystemet-types`:
@@ -65,15 +61,15 @@ body {
6561
## 3. Bruk en React-komponent
6662

6763
```tsx
68-
import '@digdir/designsystemet-theme'; /* eller ditt tema */
6964
import '@digdir/designsystemet-css'; /* importeres kun en gang */
65+
import '@digdir/designsystemet-css/theme'; /* eller ditt tema */
7066

7167
import { Button } from '@digdir/designsystemet-react';
7268

7369
<Button variant='secondary'>Jeg er en knapp!</Button>;
7470
```
7571

76-
`@digdir/designsystemet-theme` og `@digdir/designsystemet-css` må kun importeres én gang i applikasjonen.
72+
`@digdir/designsystemet-css` og `@digdir/designsystemet-css/theme` må kun importeres én gang i applikasjonen.
7773

7874
## Eksta
7975

apps/www/app/content/components-docs/no/get-started/without-react.mdx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Dette arbeider vi med å løfte ut av React og gjere tilgjengeleg for alle tekno
1414

1515
## Kom i gang
1616

17-
For å bruke Designsystemets uten React, trenger du CSS pakka. Du kan også installere `@digdir/designsystemet-theme` (for standard Designsystemet stil), eller [lage ditt eget tema](/no/fundamentals/themebuilder/own-theme). Du kan lett lage ditt eget tema senere.
17+
For å bruke Designsystemets uten React, trenger du CSS pakka. Du kan [lage ditt eget tema](/no/fundamentals/themebuilder/own-theme), eller bruke standardtemaet fra `@digdir/designsystemet-css/theme`. Du kan lett lage ditt eget tema senere.
1818

1919
```sh
20-
npm i @digdir/designsystemet-css @digdir/designsystemet-theme
20+
npm i @digdir/designsystemet-css
2121
```
2222

2323
### Legg til CSS i prosjektet ditt
@@ -28,19 +28,18 @@ Du kan importere CSS filene direkte i din hoved CSS fil, eller legge de til som
2828

2929
```css
3030
@import '@digdir/designsystemet-css/index.css';
31-
@import '@digdir/designsystemet-theme/index.css';
31+
@import '@digdir/designsystemet-css/theme.css';
3232
```
3333

3434
#### Import i JS fil
3535

3636
Hvis du har støtte for å importere CSS i JavaScript filer, kan du bruke denne metoden:
3737

3838
```js
39-
import '@digdir/designsystemet-css/index.css';
40-
import '@digdir/designsystemet-theme/index.css';
39+
import '@digdir/designsystemet-css';
40+
import '@digdir/designsystemet-css/theme';
4141
```
4242

43-
4443
## Ta i bruk
4544

4645
Alle komponentar har ein seksjon for HTML nederst på kode-sidene i dokumentasjonen. Her får du info om korleis du kan bruke komponentane med rein HTML, og eventuelle fallgruver.

packages/css/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
CSS implementation of the Designsystemet components
44

55
- Uses [@layer](https://developer.mozilla.org/en-US/docs/Web/CSS/@layer) `ds`
6-
- Uses `@digdir/designsystemet-theme` or CSS file generated from `@digdir/designsystemet tokens build` for theming
7-
- Build your own theme on https://theme.designsystemet.no/
6+
- Exports a default theme under `/theme` or CSS file generated from `@digdir/designsystemet tokens build` for theming
7+
- Build your own theme on https://theme.designsystemet.no/en
88

99
Read the Designsystemet [README](https://github.com/digdir/designsystemet) to get started.
1010

0 commit comments

Comments
 (0)