Skip to content

Pull main into dev? #4

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ I roten av dette repoet finner du en kopi av config-filen for NTNU:

`designsystemet.config.json`

**Sist oppdatert**: 2025-11-26
Visualisering av config-filen kan ses i [temabyggern](https://theme.designsystemet.no/no/themebuilder?main=accent%3A%23004DB2&neutral=%23D4C3B2&support=support-color-1%3A%23F0C881+support-color-2%3A%23ECBECD+support-color-3%3A%23103E0D&severity=info%3A%23ACD0D3+warning%3A%23F6A43F+danger%3A%23DA0909&severity-enabled=true&border-radius=2&appearance=light&tab=colorsystem).

**Sist oppdatert**: 2026-02-04

Denne kopien av filen vedlikeholdes og offentliggjøres her med jevne mellomrom fra [designsystemet.config.json](https://git.ntnu.no/it-dev/designsystemet/blob/main/designsystemet.config.json).

Expand Down
20 changes: 20 additions & 0 deletions design-tokens-build/colors.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* This file is deprecated and will be removed in a future release. Use types.d.ts instead */
/* build: v1.11.0 */
import type {} from '@digdir/designsystemet-types';

// Augment types based on theme
declare module '@digdir/designsystemet-types' {
export interface ColorDefinitions {
accent: never;
'support-color-1': never;
'support-color-2': never;
'support-color-3': never;
neutral: never;
}
export interface SeverityColorDefinitions {
info: never;
success: never;
warning: never;
danger: never;
}
}
1,155 changes: 1,155 additions & 0 deletions design-tokens-build/ntnu.css

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions design-tokens-build/types.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* build: v1.11.0 */
import type {} from '@digdir/designsystemet-types';

// Augment types based on theme
declare module '@digdir/designsystemet-types' {
export interface ColorDefinitions {
accent: never;
'support-color-1': never;
'support-color-2': never;
'support-color-3': never;
neutral: never;
}
export interface SeverityColorDefinitions {
info: never;
success: never;
warning: never;
danger: never;
}
}
9 changes: 3 additions & 6 deletions design-tokens/$metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@
"themes/ntnu",
"semantic/color",
"semantic/modes/main-color/accent",
"semantic/modes/main-color/base",
"semantic/modes/main-color/primary",
"semantic/modes/main-color/secondary",
"semantic/modes/support-color/vimu",
"semantic/modes/support-color/ub",
"semantic/modes/support-color/student",
"semantic/modes/support-color/support-color-1",
"semantic/modes/support-color/support-color-2",
"semantic/modes/support-color/support-color-3",
"semantic/style"
]
}
42 changes: 9 additions & 33 deletions design-tokens/$themes.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,50 +109,26 @@
"group": "Main color"
},
{
"id": "d3d13a7b4bd42efbfa75922c54630b9bb6bdd56d",
"name": "base",
"id": "3be8e16ad743ddaea63802d50e1390bc0ec51c9e",
"name": "support-color-1",
"selectedTokenSets": {
"semantic/modes/main-color/base": "enabled"
},
"group": "Main color"
},
{
"id": "593774a74235b661fff40693ca7bda160aadfb74",
"name": "primary",
"selectedTokenSets": {
"semantic/modes/main-color/primary": "enabled"
},
"group": "Main color"
},
{
"id": "e610f39341776da3131ab35ba751b53d9a14b80a",
"name": "secondary",
"selectedTokenSets": {
"semantic/modes/main-color/secondary": "enabled"
},
"group": "Main color"
},
{
"id": "4de07c8fb02a00a2278ea6bc04c6b2ed79c13b9c",
"name": "vimu",
"selectedTokenSets": {
"semantic/modes/support-color/vimu": "enabled"
"semantic/modes/support-color/support-color-1": "enabled"
},
"group": "Support color"
},
{
"id": "e7306b49409eb94d27ce9a52e22fe4809f8a0708",
"name": "ub",
"id": "14535e7d44b0dbab359d5d951a6f39119246090d",
"name": "support-color-2",
"selectedTokenSets": {
"semantic/modes/support-color/ub": "enabled"
"semantic/modes/support-color/support-color-2": "enabled"
},
"group": "Support color"
},
{
"id": "da1649bc0c9a5da02f9a397759175a21171d9577",
"name": "student",
"id": "83179fe40ba1746d1fd4a64c853b7fec54aa08ed",
"name": "support-color-3",
"selectedTokenSets": {
"semantic/modes/support-color/student": "enabled"
"semantic/modes/support-color/support-color-3": "enabled"
},
"group": "Support color"
}
Expand Down
Loading