colors added and fixed

layerx-labs · Sep 12, 2024 · fe08d50 · fe08d50
1 parent 9f22b7a
commit fe08d50
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 19 deletions.
diff --git a/tokens/Base.json b/tokens/Base.json
@@ -4,12 +4,24 @@
       "$type": "fontFamilies",
       "$value": "\"Inter\",\"SF Pro Display\",-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen,Ubuntu, Cantarell,\"Open Sans\",\"Helvetica Neue\",sans-serif"
     },
+    "Inter-Display": {
+      "$type": "fontFamilies",
+      "$value": "\"Inter Display\", \"Inter\",\"SF Pro Display\",-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen,Ubuntu, Cantarell,\"Open Sans\",\"Helvetica Neue\",sans-serif"
+    },
     "GeistMono": {
       "$type": "fontFamilies",
       "$value": "\"Geist Mono\", \"SF Mono\", \"Consolas\", \"Liberation Mono\", \"Menlo\", \"Courier\", \"monospace\""
     }
   },
   "fontWeight": {
+    "12": {
+      "$type": "fontWeights",
+      "$value": "12"
+    },
+    "16": {
+      "$type": "fontWeights",
+      "$value": "16"
+    },
     "100": {
       "$type": "fontWeights",
       "$value": "100"
@@ -480,27 +492,59 @@
     }
   },
   "lineHeight": {
-    "100": {
+    "20": {
+      "$type": "lineHeights",
+      "$value": "20"
+    },
+    "24": {
+      "$type": "lineHeights",
+      "$value": "24"
+    },
+    "28": {
+      "$type": "lineHeights",
+      "$value": "28"
+    },
+    "32": {
+      "$type": "lineHeights",
+      "$value": "32"
+    },
+    "40": {
+      "$type": "lineHeights",
+      "$value": "40"
+    },
+    "48": {
+      "$type": "lineHeights",
+      "$value": "48"
+    },
+    "56": {
+      "$type": "lineHeights",
+      "$value": "56"
+    },
+    "64": {
+      "$type": "lineHeights",
+      "$value": "64"
+    },
+    "100p": {
       "$type": "lineHeights",
       "$value": "100%"
     },
-    "120": {
+    "120p": {
       "$type": "lineHeights",
       "$value": "120%"
     },
-    "140": {
+    "140p": {
       "$type": "lineHeights",
       "$value": "140%"
     },
-    "160": {
+    "160p": {
       "$type": "lineHeights",
       "$value": "160%"
     },
-    "180": {
+    "180p": {
       "$type": "lineHeights",
       "$value": "180%"
     },
-    "200": {
+    "200p": {
       "$type": "lineHeights",
       "$value": "200%"
     }
@@ -600,6 +644,14 @@
       "$type": "letterSpacing",
       "$value": "-1%"
     },
+    "-1_5": {
+      "$type": "letterSpacing",
+      "$value": "-1.5%"
+    },
+    "-0_5": {
+      "$type": "letterSpacing",
+      "$value": "-0.5%"
+    },
     "-2": {
       "$type": "letterSpacing",
       "$value": "-2%"

diff --git a/tokens/Global.json b/tokens/Global.json
@@ -242,6 +242,10 @@
       "$type": "fontFamilies",
       "$value": "{fontFamilty.Inter}"
     },
+    "headings": {
+      "$type": "fontFamilies",
+      "$value": "{fontFamilty.Inter-Display}"
+    },
     "code": {
       "$type": "fontFamilies",
       "$value": "{fontFamilty.GeistMono}"
@@ -298,12 +302,12 @@
       "h1": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{fontFamily.primary}",
-          "fontWeight": "{fontWeight.semibold}",
-          "lineHeight": "{lineHeight.none}",
+          "fontFamily": "{fontFamily.headings}",
+          "fontWeight": "{fontWeight.medium}",
+          "lineHeight": "{lineHeight.64}",
           "fontSizes": "{fontSizes.72}",
-          "fontSize": "{fontSize.8xl}",
-          "letterSpacing": "{letterSpacing.normal}",
+          "fontSize": "{fontSize.6xl}",
+          "letterSpacing": "{letterSpacing.tighter}",
           "textCase": "{textCase.none}",
           "textDecoration": "{textDecoration.none}",
           "paragraphSpacing": "{paragraphSpacing.none}"
@@ -783,6 +787,22 @@
       }
     }
   },
+  "heading": {
+    "h1-copy": {
+      "$type": "typography",
+      "$value": {
+        "fontWeight": "{fontWeight.medium}",
+        "lineHeight": "{lineHeight.64}",
+        "fontSizes": "{fontSizes.72}",
+        "fontSize": "{fontSize.6xl}",
+        "letterSpacing": "{letterSpacing.tighter}",
+        "textCase": "{textCase.none}",
+        "textDecoration": "{textDecoration.none}",
+        "paragraphSpacing": "{paragraphSpacing.none}",
+        "fontFamily": "{fontFamily.headings}"
+      }
+    }
+  },
   "fontSize": {
     "2xs": {
       "$type": "fontSizes",
@@ -848,15 +868,15 @@
   "letterSpacing": {
     "tightest": {
       "$type": "letterSpacing",
-      "$value": "{letterSpacing.-2_5}"
+      "$value": "{letterSpacing.-1_5}"
     },
     "tighter": {
       "$type": "letterSpacing",
-      "$value": "{letterSpacing.-2}"
+      "$value": "{letterSpacing.-1}"
     },
     "tight": {
       "$type": "letterSpacing",
-      "$value": "{letterSpacing.-1}"
+      "$value": "{letterSpacing.-0_5}"
     },
     "normal": {
       "$type": "letterSpacing",
@@ -878,23 +898,23 @@
   "lineHeight": {
     "none": {
       "$type": "lineHeights",
-      "$value": "{lineHeight.100}"
+      "$value": "{lineHeight.100p}"
     },
     "tight": {
       "$type": "lineHeights",
-      "$value": "{lineHeight.120}"
+      "$value": "{lineHeight.120p}"
     },
     "snug": {
       "$type": "lineHeights",
-      "$value": "{lineHeight.140}"
+      "$value": "{lineHeight.140p}"
     },
     "relaxed": {
       "$type": "lineHeights",
-      "$value": "{lineHeight.180}"
+      "$value": "{lineHeight.180p}"
     },
     "loose": {
       "$type": "lineHeights",
-      "$value": "{lineHeight.200}"
+      "$value": "{lineHeight.200p}"
     }
   },
   "textCase": {