Merge pull request #4322 from grommet/update-tokens

Update tokens from Figma
grommet · Nov 6, 2024 · 85e8e38 · 85e8e38
2 parents 57d089b + 5e6cb19
commit 85e8e38
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 77 deletions.
diff --git a/design-tokens/tokens/component/component.default.json b/design-tokens/tokens/component/component.default.json
@@ -1483,7 +1483,7 @@
         },
         "borderRadius": {
           "$type": "number",
-          "$value": "{radius.full}",
+          "$value": "{base.static.radius.full}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -1877,7 +1877,7 @@
         },
         "borderRadius": {
           "$type": "number",
-          "$value": "{radius.full}",
+          "$value": "{base.static.radius.full}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -2560,7 +2560,7 @@
         },
         "fontSize": {
           "$type": "number",
-          "$value": "{text.small.fontSize}",
+          "$value": "{element.small.fontSize}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -2734,7 +2734,7 @@
         },
         "borderRadius": {
           "$type": "number",
-          "$value": "{radius.full}",
+          "$value": "{base.static.radius.full}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -4558,7 +4558,7 @@
         },
         "borderRadius": {
           "$type": "number",
-          "$value": "{radius.full}",
+          "$value": "{base.static.radius.full}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -5305,7 +5305,7 @@
     },
     "margin": {
       "$type": "number",
-      "$value": "{spacing.xsmall}",
+      "$value": "{base.static.spacing.xsmall}",
       "$description": "",
       "$extensions": {
         "com.figma": {
@@ -5573,7 +5573,7 @@
         },
         "borderWidth": {
           "$type": "number",
-          "$value": "{button.medium.default.borderWidth}",
+          "$value": "{base.static.borderWidth.default}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -5705,7 +5705,7 @@
         },
         "borderRadius": {
           "$type": "number",
-          "$value": "{radius.none}",
+          "$value": "{base.static.radius.none}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -6369,7 +6369,7 @@
       "control": {
         "height": {
           "$type": "number",
-          "$value": "{element.medium.lineHeight}",
+          "$value": "{base.dimension.600}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -6381,7 +6381,7 @@
         },
         "width": {
           "$type": "number",
-          "$value": "{element.medium.lineHeight}",
+          "$value": "{base.dimension.600}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -6888,7 +6888,7 @@
         "track": {
           "height": {
             "$type": "number",
-            "$value": "{element.medium.lineHeight}",
+            "$value": "{base.dimension.600}",
             "$description": "",
             "$extensions": {
               "com.figma": {
@@ -6938,7 +6938,7 @@
         "handle": {
           "height": {
             "$type": "number",
-            "$value": "{element.medium.lineHeight}",
+            "$value": "{base.dimension.550}",
             "$description": "",
             "$extensions": {
               "com.figma": {
@@ -6950,7 +6950,7 @@
           },
           "width": {
             "$type": "number",
-            "$value": "{element.medium.lineHeight}",
+            "$value": "{base.dimension.550}",
             "$description": "",
             "$extensions": {
               "com.figma": {
@@ -8354,7 +8354,7 @@
               "$extensions": {
                 "com.figma": {
                   "hiddenFromPublishing": false,
-                  "scopes": ["SHAPE_FILL", "TEXT_FILL"],
+                  "scopes": ["STROKE_COLOR"],
                   "codeSyntax": {}
                 }
               }
@@ -9965,7 +9965,7 @@
       "control": {
         "height": {
           "$type": "number",
-          "$value": "{element.medium.lineHeight}",
+          "$value": "{base.dimension.600}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -9977,7 +9977,7 @@
         },
         "width": {
           "$type": "number",
-          "$value": "{element.medium.lineHeight}",
+          "$value": "{base.dimension.600}",
           "$description": "",
           "$extensions": {
             "com.figma": {
@@ -10001,7 +10001,7 @@
         },
         "borderRadius": {
           "$type": "number",
-          "$value": "{radius.full}",
+          "$value": "{base.static.radius.full}",
           "$description": "",
           "$extensions": {
             "com.figma": {

diff --git a/design-tokens/tokens/semantic/color.dark.json b/design-tokens/tokens/semantic/color.dark.json
@@ -99,7 +99,7 @@
       },
       "contrast": {
         "$type": "color",
-        "$value": "{base.color.white.opacity6}",
+        "$value": "{base.color.white.opacity12}",
         "$description": "",
         "$extensions": {
           "com.figma": {
@@ -109,32 +109,6 @@
           }
         }
       },
-      "primary": {
-        "default": {
-          "$type": "color",
-          "$value": "{base.color.green.600}",
-          "$description": "The default primary color of components at a rest/ enabled state. The term ‘primary’ denoting hierarchy - the most important thing. Use to style components prominently and give greater visual hierarchy.",
-          "$extensions": {
-            "com.figma": {
-              "hiddenFromPublishing": false,
-              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
-              "codeSyntax": {}
-            }
-          }
-        },
-        "hover": {
-          "$type": "color",
-          "$value": "{TBD}",
-          "$description": "Hover color variant of the primary color.",
-          "$extensions": {
-            "com.figma": {
-              "hiddenFromPublishing": false,
-              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
-              "codeSyntax": {}
-            }
-          }
-        }
-      },
       "unknown": {
         "$type": "color",
         "$value": "{base.color.white.opacity6}",
@@ -225,6 +199,32 @@
           }
         }
       },
+      "primary": {
+        "default": {
+          "$type": "color",
+          "$value": "{base.color.green.600}",
+          "$description": "The default primary color of components at a rest/ enabled state. The term ‘primary’ denoting hierarchy - the most important thing. Use to style components prominently and give greater visual hierarchy.",
+          "$extensions": {
+            "com.figma": {
+              "hiddenFromPublishing": false,
+              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
+              "codeSyntax": {}
+            }
+          }
+        },
+        "hover": {
+          "$type": "color",
+          "$value": "{TBD}",
+          "$description": "Hover color variant of the primary color.",
+          "$extensions": {
+            "com.figma": {
+              "hiddenFromPublishing": false,
+              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
+              "codeSyntax": {}
+            }
+          }
+        }
+      },
       "ok": {
         "$type": "color",
         "$value": "{base.color.green.500-Opacity30}",

diff --git a/design-tokens/tokens/semantic/color.light.json b/design-tokens/tokens/semantic/color.light.json
@@ -109,32 +109,6 @@
           }
         }
       },
-      "primary": {
-        "default": {
-          "$type": "color",
-          "$value": "{base.color.green.600}",
-          "$description": "The default primary color of components at a rest/ enabled state. The term ‘primary’ denoting hierarchy - the most important thing. Use to style components prominently and give greater visual hierarchy.",
-          "$extensions": {
-            "com.figma": {
-              "hiddenFromPublishing": false,
-              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
-              "codeSyntax": {}
-            }
-          }
-        },
-        "hover": {
-          "$type": "color",
-          "$value": "{TBD}",
-          "$description": "Hover color variant of the primary color.",
-          "$extensions": {
-            "com.figma": {
-              "hiddenFromPublishing": false,
-              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
-              "codeSyntax": {}
-            }
-          }
-        }
-      },
       "unknown": {
         "$type": "color",
         "$value": "{base.color.black.opacity4}",
@@ -225,6 +199,32 @@
           }
         }
       },
+      "primary": {
+        "default": {
+          "$type": "color",
+          "$value": "{base.color.green.600}",
+          "$description": "The default primary color of components at a rest/ enabled state. The term ‘primary’ denoting hierarchy - the most important thing. Use to style components prominently and give greater visual hierarchy.",
+          "$extensions": {
+            "com.figma": {
+              "hiddenFromPublishing": false,
+              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
+              "codeSyntax": {}
+            }
+          }
+        },
+        "hover": {
+          "$type": "color",
+          "$value": "{TBD}",
+          "$description": "Hover color variant of the primary color.",
+          "$extensions": {
+            "com.figma": {
+              "hiddenFromPublishing": false,
+              "scopes": ["FRAME_FILL", "SHAPE_FILL"],
+              "codeSyntax": {}
+            }
+          }
+        }
+      },
       "ok": {
         "$type": "color",
         "$value": "{base.color.green.400-Opacity24}",

diff --git a/yarn.lock b/yarn.lock
@@ -7442,12 +7442,7 @@ graphlib@^2.1.5:
   dependencies:
     lodash "^4.17.15"
 
-grommet-icons@^4.12.1:
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/grommet-icons/-/grommet-icons-4.12.1.tgz#780aa7cd59c5586f642f221bdb5c6becd04ad000"
-  integrity sha512-LhOP6BkDAGiSNcUOfsGGRo+AKD6zWOXeNeusY1WYvKplAR6mKCAQfH7Nig2Buc/v5zadKSko2NDtCQqwJaME0Q==
-
-"grommet-icons@https://github.com/grommet/grommet-icons/tarball/stable":
+grommet-icons@^4.12.1, "grommet-icons@https://github.com/grommet/grommet-icons/tarball/stable":
   version "4.12.1"
   resolved "https://github.com/grommet/grommet-icons/tarball/stable#92f4e88ab19fa618a4952ac74802f606bf44c207"
 
@@ -7458,7 +7453,7 @@ [email protected]:
 
 "grommet@https://github.com/grommet/grommet/tarball/stable":
   version "2.41.0"
-  resolved "https://github.com/grommet/grommet/tarball/stable#699dfc3e472cbcd07ff09d55148ed94e2976bf9d"
+  resolved "https://github.com/grommet/grommet/tarball/stable#1d6c8634e10f1a3de71e5be0d5ff9aad4d6cb422"
   dependencies:
     "@emotion/is-prop-valid" "^1.3.1"
     grommet-icons "^4.12.1"