font-main->font-family

digdir · Jun 20, 2024 · e29fad1 · e29fad1
1 parent f19336a
commit e29fad1
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 43 deletions.
diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json
@@ -898,10 +898,10 @@
       "color.brand3.13": "6c18cc4fd4e2df483bc72138e2e25e9278354907",
       "color.brand3.contrast-1": "845896e0ceaab8e747411b34c8ab2c89e8159ec1",
       "color.brand3.contrast-2": "5702a97f681bb47c3577b579b95514b863cbbfb7",
-      "font.main": "d3792e2633a3b10b22a96e88cad9d42981bf9a69",
       "font-weight.medium": "9478c247d6eedfe8729133f14275efd7893f1573",
       "font-weight.semibold": "579599f347e4ad144214f1b11db1e0c60b11e352",
-      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b"
+      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b",
+      "font.family": "d3792e2633a3b10b22a96e88cad9d42981bf9a69"
     },
     "group": "Theme"
   },
@@ -990,10 +990,10 @@
       "color.brand3.13": "6c18cc4fd4e2df483bc72138e2e25e9278354907",
       "color.brand3.contrast-1": "845896e0ceaab8e747411b34c8ab2c89e8159ec1",
       "color.brand3.contrast-2": "5702a97f681bb47c3577b579b95514b863cbbfb7",
-      "font.main": "d3792e2633a3b10b22a96e88cad9d42981bf9a69",
       "font-weight.medium": "9478c247d6eedfe8729133f14275efd7893f1573",
       "font-weight.semibold": "579599f347e4ad144214f1b11db1e0c60b11e352",
-      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b"
+      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b",
+      "font.family": "d3792e2633a3b10b22a96e88cad9d42981bf9a69"
     },
     "group": "Theme"
   },
@@ -1284,10 +1284,10 @@
       "color.brand3.13": "6c18cc4fd4e2df483bc72138e2e25e9278354907",
       "color.brand3.contrast-1": "845896e0ceaab8e747411b34c8ab2c89e8159ec1",
       "color.brand3.contrast-2": "5702a97f681bb47c3577b579b95514b863cbbfb7",
-      "font.main": "d3792e2633a3b10b22a96e88cad9d42981bf9a69",
       "font-weight.medium": "9478c247d6eedfe8729133f14275efd7893f1573",
       "font-weight.semibold": "579599f347e4ad144214f1b11db1e0c60b11e352",
-      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b"
+      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b",
+      "font.family": "d3792e2633a3b10b22a96e88cad9d42981bf9a69"
     },
     "group": "Theme"
   },
@@ -1715,10 +1715,10 @@
       "color.brand3.13": "6c18cc4fd4e2df483bc72138e2e25e9278354907",
       "color.brand3.contrast-1": "845896e0ceaab8e747411b34c8ab2c89e8159ec1",
       "color.brand3.contrast-2": "5702a97f681bb47c3577b579b95514b863cbbfb7",
-      "font.main": "d3792e2633a3b10b22a96e88cad9d42981bf9a69",
       "font-weight.medium": "9478c247d6eedfe8729133f14275efd7893f1573",
       "font-weight.semibold": "579599f347e4ad144214f1b11db1e0c60b11e352",
-      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b"
+      "font-weight.regular": "3296aa034f5208602a2f0bcfc76d1eeda762d42b",
+      "font.family": "d3792e2633a3b10b22a96e88cad9d42981bf9a69"
     },
     "group": "Theme"
   },

diff --git a/design-tokens/semantic/style.json b/design-tokens/semantic/style.json
@@ -4,7 +4,7 @@
       "2xl": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.11}",
@@ -14,7 +14,7 @@
       "xl": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.10}",
@@ -25,7 +25,7 @@
       "lg": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.9}",
@@ -36,7 +36,7 @@
       "md": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.8}",
@@ -47,7 +47,7 @@
       "sm": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.7}",
@@ -58,7 +58,7 @@
       "xs": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.6}",
@@ -69,7 +69,7 @@
       "2xs": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.5}",
@@ -82,7 +82,7 @@
       "lg": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.lg}",
           "fontSize": "{font-size.8}",
@@ -92,7 +92,7 @@
       "md": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.lg}",
           "fontSize": "{font-size.7}",
@@ -102,7 +102,7 @@
       "sm": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.lg}",
           "fontSize": "{font-size.6}",
@@ -112,7 +112,7 @@
       "xs": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.lg}",
           "fontSize": "{font-size.5}",
@@ -124,7 +124,7 @@
       "lg": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.md}",
           "fontSize": "{font-size.6}",
@@ -134,7 +134,7 @@
       "md": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.md}",
           "fontSize": "{font-size.5}",
@@ -144,7 +144,7 @@
       "sm": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.md}",
           "fontSize": "{font-size.4}",
@@ -154,7 +154,7 @@
       "xs": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.md}",
           "fontSize": "{font-size.3}",
@@ -165,7 +165,7 @@
         "lg": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.sm}",
             "fontSize": "{font-size.6}",
@@ -175,7 +175,7 @@
         "md": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.sm}",
             "fontSize": "{font-size.5}",
@@ -185,7 +185,7 @@
         "sm": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.sm}",
             "fontSize": "{font-size.4}",
@@ -195,7 +195,7 @@
         "xs": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.sm}",
             "fontSize": "{font-size.3}",
@@ -207,7 +207,7 @@
         "lg": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.lg}",
             "fontSize": "{font-size.5}",
@@ -217,7 +217,7 @@
         "md": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.lg}",
             "fontSize": "{font-size.4}",
@@ -227,7 +227,7 @@
         "sm": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.lg}",
             "fontSize": "{font-size.3}",
@@ -237,7 +237,7 @@
         "xs": {
           "type": "typography",
           "value": {
-            "fontFamily": "{font.main}",
+            "fontFamily": "{font.family}",
             "fontWeight": "{font-weight.regular}",
             "lineHeight": "{line-height.lg}",
             "fontSize": "{font-size.2}",
@@ -250,7 +250,7 @@
       "lg": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.6}",
@@ -260,7 +260,7 @@
       "md": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.5}",
@@ -270,7 +270,7 @@
       "sm": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.4}",
@@ -280,7 +280,7 @@
       "xs": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.medium}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.3}",
@@ -292,7 +292,7 @@
       "lg": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.6}",
@@ -302,7 +302,7 @@
       "md": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.5}",
@@ -312,7 +312,7 @@
       "sm": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.4}",
@@ -322,7 +322,7 @@
       "xs": {
         "type": "typography",
         "value": {
-          "fontFamily": "{font.main}",
+          "fontFamily": "{font.family}",
           "fontWeight": "{font-weight.regular}",
           "lineHeight": "{line-height.sm}",
           "fontSize": "{font-size.3}",

diff --git a/design-tokens/themes/theme.json b/design-tokens/themes/theme.json
@@ -312,7 +312,12 @@
     }
   },
   "font": {
-    "main": {
+    "family": {
+      "$extensions": {
+        "studio.tokens": {
+          "modify": {}
+        }
+      },
       "type": "fontFamilies",
       "value": "{theme.main}"
     }

diff --git a/design-tokens/themes/theme2.json b/design-tokens/themes/theme2.json
@@ -312,7 +312,12 @@
     }
   },
   "font": {
-    "main": {
+    "family": {
+      "$extensions": {
+        "studio.tokens": {
+          "modify": {}
+        }
+      },
       "type": "fontFamilies",
       "value": "{theme2.main}"
     }

diff --git a/design-tokens/themes/theme3.json b/design-tokens/themes/theme3.json
@@ -312,7 +312,12 @@
     }
   },
   "font": {
-    "main": {
+    "family": {
+      "$extensions": {
+        "studio.tokens": {
+          "modify": {}
+        }
+      },
       "type": "fontFamilies",
       "value": "{theme.main}"
     }

diff --git a/design-tokens/themes/theme4.json b/design-tokens/themes/theme4.json
@@ -312,7 +312,12 @@
     }
   },
   "font": {
-    "main": {
+    "family": {
+      "$extensions": {
+        "studio.tokens": {
+          "modify": {}
+        }
+      },
       "type": "fontFamilies",
       "value": "{theme2.main}"
     }