Skip to content

Commit 985f467

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # design-tokens/$designsystemet.jsonc # design-tokens/primitives/modes/color-scheme/dark/brreg.json # design-tokens/primitives/modes/color-scheme/light/brreg.json # design-tokens/semantic/color.json # design-tokens/themes/brreg.json # designsystemet.config.json
2 parents 36e0996 + 9ccd348 commit 985f467

File tree

12 files changed

+1580
-2767
lines changed

12 files changed

+1580
-2767
lines changed

.gitignore

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ out
9191
.nuxt
9292
dist
9393

94-
# Gatsby files
95-
.cache/
9694
# Comment in the public line in if your project uses Gatsby and not Next.js
9795
# https://nextjs.org/blog/next-9-1#public-directory-support
9896
# public
@@ -102,7 +100,6 @@ dist
102100

103101
# vuepress v2.x temp and cache directory
104102
.temp
105-
.cache
106103

107104
# Docusaurus cache and generated files
108105
.docusaurus
@@ -131,3 +128,14 @@ dist
131128

132129
.DS_Store
133130

131+
# IDE
132+
.cache/
133+
.idea/
134+
.classpath
135+
.project
136+
.settings/
137+
*.ipr
138+
*.iws
139+
*.iml
140+
141+
/.idea/

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ To update manually, run ```npm run build``` in your local repository.
3434

3535
### Publishing a new version
3636
To release a new version of the package automatically , just bump the version in [package.json](package.json).
37+
38+
## ToDo
39+
- Konfigurer changesets
40+
- Tags, release notes, PRs
41+
- Konfigurer kode kvalitet for CSS

css/brreg.css

Lines changed: 9 additions & 1323 deletions
Large diffs are not rendered by default.

css/generated/brreg.css

Lines changed: 1413 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
/* This file is deprecated and will be removed in a future release. Use types.d.ts instead */
2-
/* build: v1.6.1 */
3-
import type {} from '@digdir/designsystemet/types';
2+
/* build: v1.8.0 */
3+
import type {} from '@digdir/designsystemet-types';
44

55
// Augment types based on theme
6-
declare module '@digdir/designsystemet/types' {
6+
declare module '@digdir/designsystemet-types' {
77
export interface ColorDefinitions {
88
main1: never;
99
main2: never;
10+
main3: never;
11+
maintest: never;
1012
support1: never;
1113
support2: never;
12-
support3: never;
13-
support4: never;
14+
supporttest: never;
1415
neutral: never;
1516
}
1617
export interface SeverityColorDefinitions {

css/types.d.ts renamed to css/generated/types.d.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
/* build: v1.6.1 */
2-
import type {} from '@digdir/designsystemet/types';
1+
/* build: v1.8.0 */
2+
import type {} from '@digdir/designsystemet-types';
33

44
// Augment types based on theme
5-
declare module '@digdir/designsystemet/types' {
5+
declare module '@digdir/designsystemet-types' {
66
export interface ColorDefinitions {
77
main1: never;
88
main2: never;
9+
main3: never;
10+
maintest: never;
911
support1: never;
1012
support2: never;
11-
support3: never;
12-
support4: never;
13+
supporttest: never;
1314
neutral: never;
1415
}
1516
export interface SeverityColorDefinitions {

0 commit comments

Comments
 (0)