Changed structure under core and naming

digdir · May 15, 2024 · 51f4970 · 51f4970
1 parent 354d979
commit 51f4970
Show file tree

Hide file tree

Showing 16 changed files with 1,618 additions and 4,468 deletions.
diff --git a/design-tokens/$metadata.json b/design-tokens/$metadata.json
@@ -1,19 +1,17 @@
 {
   "tokenSetOrder": [
-    "core/modes/light",
-    "core/modes/dark",
-    "core/dark/global",
-    "core/dark/theme1",
-    "core/dark/theme2",
-    "core/dark/theme3",
-    "core/dark/theme4",
-    "core/light/global",
-    "core/light/theme1",
-    "core/light/theme2",
-    "core/light/theme3",
-    "core/light/theme4",
+    "core/globals",
     "core/typography/default",
-    "core/defaults",
+    "core/colors/dark/global",
+    "core/colors/dark/theme1",
+    "core/colors/dark/theme2",
+    "core/colors/dark/theme3",
+    "core/colors/dark/theme4",
+    "core/colors/light/global",
+    "core/colors/light/theme1",
+    "core/colors/light/theme2",
+    "core/colors/light/theme3",
+    "core/colors/light/theme4",
     "themes/theme1",
     "themes/theme2",
     "themes/theme3",

diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json
diff --git a/design-tokens/core/dark/global.json → design-tokens/core/colors/dark/global.json b/design-tokens/core/dark/global.json → design-tokens/core/colors/dark/global.json
diff --git a/design-tokens/core/dark/theme1.json → design-tokens/core/colors/dark/theme1.json b/design-tokens/core/dark/theme1.json → design-tokens/core/colors/dark/theme1.json
diff --git a/design-tokens/core/dark/theme2.json → design-tokens/core/colors/dark/theme2.json b/design-tokens/core/dark/theme2.json → design-tokens/core/colors/dark/theme2.json
diff --git a/design-tokens/core/dark/theme3.json → design-tokens/core/colors/dark/theme3.json b/design-tokens/core/dark/theme3.json → design-tokens/core/colors/dark/theme3.json
diff --git a/design-tokens/core/dark/theme4.json → design-tokens/core/colors/dark/theme4.json b/design-tokens/core/dark/theme4.json → design-tokens/core/colors/dark/theme4.json
diff --git a/design-tokens/core/light/global.json → design-tokens/core/colors/light/global.json b/design-tokens/core/light/global.json → design-tokens/core/colors/light/global.json
diff --git a/design-tokens/core/light/theme1.json → design-tokens/core/colors/light/theme1.json b/design-tokens/core/light/theme1.json → design-tokens/core/colors/light/theme1.json
diff --git a/design-tokens/core/light/theme2.json → design-tokens/core/colors/light/theme2.json b/design-tokens/core/light/theme2.json → design-tokens/core/colors/light/theme2.json
diff --git a/design-tokens/core/light/theme3.json → design-tokens/core/colors/light/theme3.json b/design-tokens/core/light/theme3.json → design-tokens/core/colors/light/theme3.json
diff --git a/design-tokens/core/light/theme4.json → design-tokens/core/colors/light/theme4.json b/design-tokens/core/light/theme4.json → design-tokens/core/colors/light/theme4.json
diff --git a/design-tokens/core/defaults.json → design-tokens/core/globals.json b/design-tokens/core/defaults.json → design-tokens/core/globals.json
@@ -149,41 +149,41 @@
     }
   },
   "borderRadius": {
-    "sm": {
+    "2": {
       "value": "2",
       "type": "borderRadius"
     },
-    "md": {
+    "4": {
       "value": "4",
       "type": "borderRadius"
     },
-    "lg": {
+    "8": {
       "value": "8",
       "type": "borderRadius"
     },
-    "xl": {
+    "12": {
       "value": "12",
       "type": "borderRadius"
     },
-    "2xl": {
+    "16": {
       "value": "16",
       "type": "borderRadius"
     },
-    "3xl": {
+    "24": {
       "value": "24",
       "type": "borderRadius"
     },
-    "4xl": {
+    "32": {
       "value": "32",
       "type": "borderRadius"
     },
-    "full": {
+    "9999": {
       "value": "9999",
       "type": "borderRadius"
     }
   },
   "opacity": {
-    "disabledComponents": {
+    "30": {
       "value": "30%",
       "type": "opacity"
     }