Skip to content

Commit

Permalink
Merge branch 'master' into site-refresh-NEXT
Browse files Browse the repository at this point in the history
  • Loading branch information
@taysea
taysea committed Nov 13, 2024
2 parents 44ae222 + 45a0c65 commit 5fcd589
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 164 deletions.
160 changes: 8 additions & 152 deletions design-tokens/tokens/primitive/primitives.base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@
},
"gold1": {
"$type": "color",
"$value": "#be8e0a",
"$value": "#bd8d09",
"$description": "",
"$extensions": {
"com.figma": {
Expand Down Expand Up @@ -1502,7 +1502,7 @@
},
"darkblue2": {
"$type": "color",
"$value": "#b3ebff",
"$value": "#006f99",
"$description": "",
"$extensions": {
"com.figma": {
Expand All @@ -1514,7 +1514,7 @@
},
"purple2": {
"$type": "color",
"$value": "#6013dd",
"$value": "#803bee",
"$description": "",
"$extensions": {
"com.figma": {
Expand All @@ -1526,7 +1526,7 @@
},
"gold2": {
"$type": "color",
"$value": "#f5c542",
"$value": "#c0910e",
"$description": "",
"$extensions": {
"com.figma": {
Expand All @@ -1538,7 +1538,7 @@
},
"lightblue2": {
"$type": "color",
"$value": "#0074c5",
"$value": "#78bff0",
"$description": "",
"$extensions": {
"com.figma": {
Expand All @@ -1550,7 +1550,7 @@
},
"pink2": {
"$type": "color",
"$value": "#ca319f",
"$value": "#ba2880",
"$description": "",
"$extensions": {
"com.figma": {
Expand All @@ -1562,7 +1562,7 @@
},
"blue2": {
"$type": "color",
"$value": "#0099ff",
"$value": "#1f95e4",
"$description": "",
"$extensions": {
"com.figma": {
Expand All @@ -1574,151 +1574,7 @@
},
"purple-2": {
"$type": "color",
"$value": "#a225d3",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"green1000": {
"$type": "color",
"$value": "#074b3b",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"green325": {
"$type": "color",
"$value": "#809605",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"green325-opacity50": {
"$type": "color",
"$value": "#80960580",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"pink1000": {
"$type": "color",
"$value": "#7d006c",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"pink325": {
"$type": "color",
"$value": "#f23bda",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"pink325-opacity50": {
"$type": "color",
"$value": "#f23bda80",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"purple1000": {
"$type": "color",
"$value": "#5900a1",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"purple325": {
"$type": "color",
"$value": "#ba66ff",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"purple325-opacity50": {
"$type": "color",
"$value": "#ba66ff80",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"blue1000": {
"$type": "color",
"$value": "#193a97",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"blue325": {
"$type": "color",
"$value": "#009abf",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
},
"blue325-opacity50": {
"$type": "color",
"$value": "#009abf80",
"$value": "#9a3ac0",
"$description": "",
"$extensions": {
"com.figma": {
Expand Down
26 changes: 20 additions & 6 deletions design-tokens/tokens/semantic/color.dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,20 @@
}
}
}
},
"neutral": {
"xstrong": {
"$type": "color",
"$value": "{base.color.grey.50}",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
}
}
},
"border": {
Expand Down Expand Up @@ -481,29 +495,29 @@
}
}
},
"heading": {
"onStrong": {
"default": {
"$type": "color",
"$value": "{color.text.strong}",
"$value": "{base.color.grey.1200}",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"scopes": ["TEXT_FILL"],
"codeSyntax": {}
}
}
}
},
"inverse": {
"heading": {
"default": {
"$type": "color",
"$value": "{base.color.grey.1200}",
"$value": "{color.text.strong}",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["TEXT_FILL"],
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
Expand Down
26 changes: 20 additions & 6 deletions design-tokens/tokens/semantic/color.light.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,20 @@
}
}
}
},
"neutral": {
"xstrong": {
"$type": "color",
"$value": "{base.color.grey.1000}",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
}
}
},
"border": {
Expand Down Expand Up @@ -481,29 +495,29 @@
}
}
},
"heading": {
"onStrong": {
"default": {
"$type": "color",
"$value": "{color.text.strong}",
"$value": "{base.color.white.100}",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["ALL_SCOPES"],
"scopes": ["TEXT_FILL"],
"codeSyntax": {}
}
}
}
},
"inverse": {
"heading": {
"default": {
"$type": "color",
"$value": "{base.color.white.100}",
"$value": "{color.text.strong}",
"$description": "",
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["TEXT_FILL"],
"scopes": ["ALL_SCOPES"],
"codeSyntax": {}
}
}
Expand Down

0 comments on commit 5fcd589

Please sign in to comment.