Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

fix: updating brand color figma json #702

Merged
merged 9 commits into from
May 29, 2024
Merged

fix: updating brand color figma json #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f06eef
fix: updating brand color figma json
georgewrmarshall May 23, 2024
cca01a7
chore: updating brand evolution brand colors and adding brand evoluti…
georgewrmarshall May 24, 2024
6b0d1df
chore: update to get figma storybook to render but should be changed
georgewrmarshall May 24, 2024
5dd2eaf
chore: updating light and dark theme current json
georgewrmarshall May 27, 2024
b9f285a
fix: updating inccorrectly changed colors
georgewrmarshall May 29, 2024
dbfcd4a
chore: removing brand evolution json and moving to new branch
georgewrmarshall May 29, 2024
a1921ee
chore: updating dark theme colors to be correct
georgewrmarshall May 29, 2024
07764c9
chore: updating light theme colors to be correct
georgewrmarshall May 29, 2024
47ed81b
chore: aligning colors with figma
georgewrmarshall May 29, 2024
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
70 changes: 16 additions & 54 deletions src/figma/brandColors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,6 @@
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"500-10%": {
"value": "#0376c91a",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"400-15%": {
"value": "#1098fc26",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
Comment on lines -148 to -159
Copy link
Collaborator Author

@georgewrmarshall georgewrmarshall May 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Screenshot 2024-05-27 at 10 06 22 AM Screenshot 2024-05-27 at 10 32 50 AM

}
},
"green": {
Expand Down Expand Up @@ -220,23 +208,11 @@
"parent": "Brand Colors/v1 - current",
"description": ""
},
"500-10%": {
"value": "#1c82341a",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"025": {
"value": "#f3fcf5",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"400-15%": {
"value": "#28a74526",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
Comment on lines -223 to -239
Copy link
Collaborator Author

@georgewrmarshall georgewrmarshall May 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Screenshot 2024-05-27 at 10 06 53 AM Screenshot 2024-05-27 at 10 33 01 AM

}
},
"red": {
Expand Down Expand Up @@ -305,18 +281,6 @@
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"500-10%": {
"value": "#d738471a",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"400-15%": {
"value": "#e0647026",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
Comment on lines -308 to -319
Copy link
Collaborator Author

@georgewrmarshall georgewrmarshall May 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Screenshot 2024-05-27 at 10 07 49 AM Screenshot 2024-05-27 at 10 33 19 AM

}
},
"yellow": {
Expand Down Expand Up @@ -385,24 +349,6 @@
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"500-10%": {
"value": "#bf52081a",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"400-15%": {
"value": "#f66a0a26",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"100-15%": {
"value": "#ffdf7026",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
Comment on lines -388 to -405
Copy link
Collaborator Author

@georgewrmarshall georgewrmarshall May 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Screenshot 2024-05-27 at 10 08 20 AM Screenshot 2024-05-27 at 10 33 34 AM

}
},
"orange": {
Expand Down Expand Up @@ -608,5 +554,21 @@
"parent": "Brand Colors/v1 - current",
"description": ""
}
},
"white": {
"white": {
"value": "#ffffff",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
}
},
"black": {
"black": {
"value": "#000000",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
}
Comment on lines +558 to +572
Copy link
Collaborator Author

@georgewrmarshall georgewrmarshall May 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I've updated this section so that the Figma colors will render in storybook but it's likely we should change it back an update the useJsonColor hook to handle this. @garrettbear would you be able to add the updates you made to handle these colors?

Suggested change
"white": {
"white": {
"value": "#ffffff",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
}
},
"black": {
"black": {
"value": "#000000",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
}
"white": {
"value": "#ffffff",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
},
"black": {
"value": "#000000",
"type": "color",
"parent": "Brand Colors/v1 - current",
"description": ""
}
Screenshot 2024-05-27 at 10 34 03 AM

}
}
Loading