Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 32 additions & 72 deletions apps/dictionary/tokens/internal/base/color.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
"primary"
]
},
"oxford": {
"value": "#0F5499",
"type": "color",
"origamiKeys": [
"palette",
"primary"
]
},
"teal": {
"value": "#0D7680",
"type": "color",
Expand Down Expand Up @@ -58,38 +50,6 @@
"secondary"
]
},
"lemon": {
"value": "#FFEC1A",
"type": "color",
"origamiKeys": [
"palette",
"secondary"
]
},
"jade": {
"value": "#00994d",
"type": "color",
"origamiKeys": [
"palette",
"tertiary"
]
},
"mandarin": {
"value": "#F83",
"type": "color",
"origamiKeys": [
"palette",
"tertiary"
]
},
"crimson": {
"value": "#c00",
"type": "color",
"origamiKeys": [
"palette",
"tertiary"
]
},
"black-5": {
"value": "#F2F2F2",
"type": "color"
Expand Down Expand Up @@ -130,38 +90,6 @@
"value": "#1a1a1a",
"type": "color"
},
"oxford-30": {
"value": "#082A4D",
"type": "color"
},
"oxford-40": {
"value": "#0A3866",
"type": "color"
},
"oxford-50": {
"value": "#0D4680",
"type": "color"
},
"oxford-60": {
"value": "#0F5499",
"type": "color"
},
"oxford-70": {
"value": "#1262B3",
"type": "color"
},
"oxford-80": {
"value": "#1470CC",
"type": "color"
},
"oxford-90": {
"value": "#177EE6",
"type": "color"
},
"oxford-100": {
"value": "#198CFF",
"type": "color"
},
"teal-20": {
"value": "#052F33",
"type": "color"
Expand Down Expand Up @@ -197,6 +125,38 @@
"teal-100": {
"value": "#1AEBFF",
"type": "color"
},
"jade-90": {
"value": "#00572C",
"type": "color"
},
"jade": {
"value": "#00994D",
"type": "color"
},
"jade-10": {
"value": "#CCEBDB",
"type": "color"
},
"crimson": {
"value": "#B30000",
"type": "color"
},
"crimson-10": {
"value": "#FAE6E6",
"type": "color"
},
"lemon-90": {
"value": "#695008",
"type": "color"
},
"lemon": {
"value": "#FABF14",
"type": "color"
},
"lemon-10": {
"value": "#FFF2CC",
"type": "color"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions apps/dictionary/tokens/internal/components/o3-form.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"error": {
"value": {
"color": "{o3.color.use-case.error}",
"color": "{o3.color.use-case.error.foreground}",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Was this change done in token studio?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joelcarr In this case I manually edited the value as it was known to me. Here's a screenshot showing the change pulls the correct value in tokens studio
image

"width": "1.5px",
"style": "solid"
},
Expand All @@ -39,4 +39,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,33 @@
},
"border": {
"@": {
"value": "{o3.color.palette.black-50}",
"value": "{o3.color.use-case.outline.@}",
"type": "color"
},
"hover": {
"value": "{o3.color.use-case.button.hover}",
"value": "{o3.color.palette.teal-40}",
"type": "color"
},
"active": {
"value": "{o3.color.use-case.button.pressed}",
"value": "{o3.color.palette.teal-40}",
"type": "color"
},
"disabled": {
"value": "{o3.color.use-case.button.disabled}",
"value": "#9EC0BD",
"type": "color"
}
},
"selected": {
"@": {
"value": "{o3.color.use-case.button.default}",
"value": "{o3.color.palette.teal}",
"type": "color"
},
"hover": {
"value": "{o3.color.use-case.button.hover}",
"value": "{o3.color.palette.teal-40}",
"type": "color"
},
"active": {
"value": "{o3.color.use-case.button.pressed}",
"value": "{o3.color.palette.teal-20}",
"type": "color"
},
"disabled": {
Expand Down
Loading
Loading