Skip to content

Merge Barra Changes #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miguel-hub merged 11 commits into from
Jul 1, 2026
Merged

Merge Barra Changes #105

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1f6f0ee
fix:
olearyb Nov 18, 2025
175482c
Fix:
olearyb Nov 21, 2025
ec37d33
Merge pull request #91 from Mastercard/figma-unify-mastercard-2-0
miguel-hub Jan 28, 2026
09be936
Adjusting hover and active colors for link component tokens:
olearyb Feb 9, 2026
ada6b83
Adding new tokens for the backgrounds of the Tab components in their …
olearyb Feb 9, 2026
7293d33
.
olearyb Feb 10, 2026
10fd07b
Merge pull request #99 from Mastercard/figma-unify-mastercard-2-0
miguel-hub Feb 12, 2026
7a8ca1f
Pushing a fox for a token conflict in the Unify theme for the token:
olearyb Feb 12, 2026
ee20cfd
Merge pull request #102 from Mastercard/figma-unify-mastercard-2-0
miguel-hub Mar 12, 2026
331d447
The following Design Token changes need to be made, these arose from …
olearyb Mar 13, 2026
17fb43a
Merge pull request #104 from Mastercard/feature/barra-MADE-1069
miguel-hub Mar 30, 2026
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
126 changes: 88 additions & 38 deletions plugins/made-tokens/json/made-unify-tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4190,6 +4190,16 @@
"letter-spacing": {
"$type": "letterSpacing",
"$value": "{component.tabs.contained.font-size} * -0.02"
},
"background-mode-dark": {
"$type": "color",
"$value": "{color.gray.1500}",
"$description": "Background color of tabs component group in its contained style. "
},
"background-mode-light": {
"$type": "color",
"$value": "{color.gray.300}",
"$description": "Background color of tabs component group in its contained style. "
}
},
"minimal": {
Expand Down Expand Up @@ -5352,7 +5362,7 @@
}
},
"textarea": {
"default": {
"medium": {
"padding-x": {
"$componentLevelToken": "true",
"$type": "spacing",
Expand Down Expand Up @@ -6161,7 +6171,7 @@
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.7",
"value": "0.4",
"space": "lch"
}
}
Expand All @@ -6174,13 +6184,13 @@
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.7",
"value": "0.6",
"space": "lch"
}
}
},
"$type": "color",
"$value": "{color.gray.1800}"
"$value": "{color.black}"
},
"surface": {
"default-mode-light": {
Expand Down Expand Up @@ -6686,11 +6696,13 @@
},
"disabled-mode-light": {
"$type": "color",
"$value": "{color.gray.100}"
"$value": "{color.gray.300}",
"$description": "Border color for elements in their disabled state"
},
"disabled-mode-dark": {
"$type": "color",
"$value": "{color.gray.1600}"
"$value": "{color.gray.1400}",
"$description": "Border color for elements in their disabled state"
},
"input-mode-light": {
"$type": "color",
Expand Down Expand Up @@ -7155,21 +7167,21 @@
"hover": {
"text-color-mode-light": {
"$type": "color",
"$value": "{color.gray.1600}"
"$value": "{color.gray.1300}"
},
"text-mode-dark": {
"$type": "color",
"$value": "{color.gray.200}"
"$value": "{color.gray.300}"
}
},
"active": {
"text-color-mode-light": {
"$type": "color",
"$value": "{color.gray.1400}"
"$value": "{color.gray.1200}"
},
"text-color-mode-dark": {
"$type": "color",
"$value": "{color.gray.400}"
"$value": "{color.gray.500}"
}
},
"visited": {
Expand All @@ -7196,21 +7208,21 @@
"hover": {
"text-color-mode-light": {
"$type": "color",
"$value": "{color.gray.1600}"
"$value": "{color.gray.1300}"
},
"text-color-mode-dark": {
"$type": "color",
"$value": "{color.gray.200}"
"$value": "{color.gray.300}"
}
},
"active": {
"text-color-mode-light": {
"$type": "color",
"$value": "{color.gray.1400}"
"$value": "{color.gray.1200}"
},
"text-color-mode-dark": {
"$type": "color",
"$value": "{color.gray.400}"
"$value": "{color.gray.500}"
}
},
"visited": {
Expand Down Expand Up @@ -7451,12 +7463,12 @@
"border-color-mode-light": {
"$componentLevelToken": "true",
"$type": "color",
"$value": "{color.border.none}"
"$value": "{color.border.default-mode-light}"
},
"border-color-mode-dark": {
"$componentLevelToken": "true",
"$type": "color",
"$value": "{color.border.none}"
"$value": "{color.border.default-mode-dark}"
},
"top-bar": {
"padding-top": {
Expand All @@ -7477,13 +7489,13 @@
"padding-right": {
"$componentLevelToken": "true",
"$type": "spacing",
"$value": "{size-space.12-x}"
"$value": "{size-space.6-x}"
}
},
"border-radius": {
"$componentLevelToken": "true",
"$type": "borderRadius",
"$value": "{border.radius.default}"
"$value": "{border.radius.large}"
},
"box-shadow": {
"$componentLevelToken": "true",
Expand Down Expand Up @@ -7795,6 +7807,16 @@
"letter-spacing": {
"$type": "letterSpacing",
"$value": "{component.tabs.contained.font-size} * -0.02"
},
"background-mode-light": {
"$type": "color",
"$value": "{color.gray.300}",
"$description": "Background color of tabs component group in its contained style. "
},
"background-mode-dark": {
"$type": "color",
"$value": "{color.gray.1500}",
"$description": "Background color of tabs component group in its contained style. "
}
},
"minimal": {
Expand Down Expand Up @@ -8957,7 +8979,7 @@
}
},
"textarea": {
"default": {
"medium": {
"padding-x": {
"$componentLevelToken": "true",
"$type": "spacing",
Expand Down Expand Up @@ -9086,7 +9108,7 @@
"border-radius": {
"$componentLevelToken": "true",
"$type": "borderRadius",
"$value": "{border-radius.01}"
"$value": "{border-radius.02}"
},
"box-shadow": {
"$componentLevelToken": "true",
Expand Down Expand Up @@ -12003,6 +12025,16 @@
"letter-spacing": {
"$type": "letterSpacing",
"$value": "{component.tabs.contained.font-size} * 0"
},
"background-mode-dark": {
"$type": "color",
"$value": "{color.neutral.800}",
"$description": "Background color of tabs component group in its contained style. "
},
"background-mode-light": {
"$type": "color",
"$value": "{color.neutral.200}",
"$description": "Background color of tabs component group in its contained style. "
}
},
"minimal": {
Expand Down Expand Up @@ -12480,7 +12512,7 @@
}
},
"textarea": {
"default": {
"medium": {
"padding-x": {
"$componentLevelToken": "true",
"$type": "spacing",
Expand Down Expand Up @@ -14733,7 +14765,7 @@
"border-color": {
"$colorSchemeToken": "true",
"$type": "color",
"$value": "{color.border.none}"
"$value": "{component.modal.border-color-mode-light}"
}
},
"card": {
Expand Down Expand Up @@ -14790,6 +14822,11 @@
"$type": "color",
"$value": "{color.background.surface.default-mode-light}"
}
},
"background": {
"$type": "color",
"$value": "{component.tabs.contained.background-mode-light}",
"$description": "Background color of tabs component group in its contained style. "
}
},
"minimal": {
Expand Down Expand Up @@ -15932,7 +15969,7 @@
"border-color": {
"$colorSchemeToken": "true",
"$type": "color",
"$value": "{color.border.none}"
"$value": "{component.modal.border-color-mode-dark}"
}
},
"card": {
Expand Down Expand Up @@ -15989,6 +16026,11 @@
"$type": "color",
"$value": "{color.background.surface.default-mode-dark}"
}
},
"background": {
"$type": "color",
"$value": "{component.tabs.contained.background-mode-dark}",
"$description": "Background color of tabs component group in its contained style. "
}
},
"minimal": {
Expand Down Expand Up @@ -16986,8 +17028,8 @@
"color.border.brand-mode-dark": "01522591d106784687fdec4256c701d3dee69dd0",
"color.border.default-mode-light": "7c721cc229017c5631e2248d84fbb840fed02659",
"color.border.default-mode-dark": "d5825c9de6976591db713de5777bef30f2701b05",
"color.border.bold-mode-light": "6772e2a6f3e82a98e95658ad9886c337ef17b487",
"color.border.bold-mode-dark": "b0064537a61ce6d979e712de4fdc796cf8df69c6",
"color.border.bold-mode-light": "355025673d273c4da90f7bcf6b1a2ba929005285",
"color.border.bold-mode-dark": "7d180be6d024180d62b181d0bb8b401088b8fe19",
"color.border.strong-mode-light": "d901f1a7a7a8dcde66c90df2fc045309c4d570d8",
"color.border.strong-mode-dark": "5a05b11966ebd7142fbc07d048dad4c5b2c71087",
"color.border.neutral-mode-light": "72f9656241d0dd822f3cd20b8be779327fb53bbe",
Expand Down Expand Up @@ -17198,6 +17240,8 @@
"component.tabs.contained.font-weight": "300a600a237fe4b97559b7f60cb842bf9e4e6a68",
"component.tabs.contained.line-height": "70135a8cb9485089b5ba333925683c43c0b444a7",
"component.tabs.contained.letter-spacing": "4557988163e3487ca6dae85062a7c4406f6cbc50",
"component.tabs.contained.background-mode-dark": "7755bfa1912157a2139bb5588a205d9cc544b467",
"component.tabs.contained.background-mode-light": "198df44f037cde8237f2f06ecac39e2ec8c36a91",
"component.tabs.minimal.item.background-selected-mode-light": "2567d64ec6c357ad4b33addb6517efbc7fa61c23",
"component.tabs.minimal.item.background-selected-mode-dark": "4b8f324b03c4fce37f5d58c039ecc256d8419f83",
"component.tag.border-color-mode-light": "d9768a63e1a75190c1e5976f0bed6ef9dc2bc21e",
Expand Down Expand Up @@ -17404,8 +17448,8 @@
"component.table.cell.data.font-weight": "8ce8d531e856cab0d7cc24342a33445b12aeee9e",
"component.table.cell.data.line-height": "2aaf5b16746f87ffb874c75eb529a9c71983c112",
"component.table.border-radius": "8460ece4ca59b5d0783209fdb3ea18042861ffb8",
"component.textarea.default.padding-x": "42bb30661b3def3dbda34543a731cd88f3ce073f",
"component.textarea.default.padding-y": "865cb72b70ea6864b5e05747a2420af42e8fd50f",
"component.textarea.medium.padding-x": "42bb30661b3def3dbda34543a731cd88f3ce073f",
"component.textarea.medium.padding-y": "865cb72b70ea6864b5e05747a2420af42e8fd50f",
"component.textarea.large.padding-x": "7eb31ea20382c6d4ca72cc1579c1f4df7e2fdb66",
"component.textarea.large.padding-y": "12137718e5dd8eb236801cf3a764f0e6fe326eca",
"component.drawer-picker.padding-x": "cee89d16db31c7beeadf6a5c81c3b183daa4294f",
Expand Down Expand Up @@ -17488,7 +17532,7 @@
"font-weight.h6": "9b4a35b1472d74c70e35fb96c7526470d784348a",
"font-weight.eyebrow": "34160f671e75bf9f6dfa4bafdadf40bd1b63c4cd",
"font-weight.link": "875061cb2262c6cf299a9985d2c63a7a013761a7",
"component.link.hover.text-mode-dark": "09841d3dfac56b4ea6935ae049f5677cf01a6899"
"component.link.hover.text-mode-dark": "4f5a6c301c02c6b31d5020abb183991f0cb16032"
},
"$figmaCollectionId": "VariableCollectionId:1:5",
"$figmaModeId": "1:4",
Expand Down Expand Up @@ -17791,7 +17835,7 @@
"component.link.default.text-color-mode-light": "e252daa5d288dbdb358de6c09f9b7bf49769433c",
"component.link.default.text-color-mode-dark": "0f1ccfd68e2bbb924dc95900fa1bdb16e38b3af8",
"component.link.hover.text-color-mode-light": "d070ded1abee44ba335bedce8c7d885a343ed0ec",
"component.link.hover.text-color-mode-dark": "54cab3abef3c6a61cb59396026d88bc81740dfb4",
"component.link.hover.text-color-mode-dark": "11f0ea1cbe6512e75b3c859500aea4b05507ee79",
"component.link.active.text-color-mode-light": "ad894d05bca4b02a78f72c41c9ffd70735ca2e61",
"component.link.active.text-color-mode-dark": "52535d5265dd4c696c9349ab1ac5aaf5b46a7da2",
"component.link.visited.text-color-mode-light": "2aee1b0ac0b31748b55d8b889672a182d324e5f0",
Expand Down Expand Up @@ -17898,6 +17942,8 @@
"component.tabs.contained.font-weight": "300a600a237fe4b97559b7f60cb842bf9e4e6a68",
"component.tabs.contained.line-height": "70135a8cb9485089b5ba333925683c43c0b444a7",
"component.tabs.contained.letter-spacing": "4557988163e3487ca6dae85062a7c4406f6cbc50",
"component.tabs.contained.background-mode-dark": "7755bfa1912157a2139bb5588a205d9cc544b467",
"component.tabs.contained.background-mode-light": "198df44f037cde8237f2f06ecac39e2ec8c36a91",
"component.tabs.minimal.item.background-selected-mode-light": "2567d64ec6c357ad4b33addb6517efbc7fa61c23",
"component.tabs.minimal.item.background-selected-mode-dark": "4b8f324b03c4fce37f5d58c039ecc256d8419f83",
"component.tag.border-color-mode-light": "d9768a63e1a75190c1e5976f0bed6ef9dc2bc21e",
Expand Down Expand Up @@ -18104,8 +18150,8 @@
"component.table.cell.data.font-weight": "8ce8d531e856cab0d7cc24342a33445b12aeee9e",
"component.table.cell.data.line-height": "2aaf5b16746f87ffb874c75eb529a9c71983c112",
"component.table.border-radius": "8460ece4ca59b5d0783209fdb3ea18042861ffb8",
"component.textarea.default.padding-x": "42bb30661b3def3dbda34543a731cd88f3ce073f",
"component.textarea.default.padding-y": "865cb72b70ea6864b5e05747a2420af42e8fd50f",
"component.textarea.medium.padding-x": "42bb30661b3def3dbda34543a731cd88f3ce073f",
"component.textarea.medium.padding-y": "865cb72b70ea6864b5e05747a2420af42e8fd50f",
"component.textarea.large.padding-x": "7eb31ea20382c6d4ca72cc1579c1f4df7e2fdb66",
"component.textarea.large.padding-y": "12137718e5dd8eb236801cf3a764f0e6fe326eca",
"component.drawer-picker.padding-x": "cee89d16db31c7beeadf6a5c81c3b183daa4294f",
Expand Down Expand Up @@ -18188,8 +18234,8 @@
"font-weight.h6": "9b4a35b1472d74c70e35fb96c7526470d784348a",
"font-weight.eyebrow": "34160f671e75bf9f6dfa4bafdadf40bd1b63c4cd",
"font-weight.link": "875061cb2262c6cf299a9985d2c63a7a013761a7",
"color.border.strongest-mode-light": "3ab4ff526239620a34d8636e00b5f552de3715ae",
"color.border.strongest-mode-dark": "30d5ef2b02a161c223e7d9f96f85acab7d406fd4"
"color.border.strongest-mode-light": "3f1c4d3b36a85bb1153d4ee7b606ca1aff2508a3",
"color.border.strongest-mode-dark": "5e9b64d8d076818548e16c432c305522dcc3e2d0"
},
"$figmaCollectionId": "VariableCollectionId:1:5",
"$figmaModeId": "1:3",
Expand Down Expand Up @@ -18355,8 +18401,8 @@
"color.border.brand-mode-dark": "01522591d106784687fdec4256c701d3dee69dd0",
"color.border.default-mode-light": "7c721cc229017c5631e2248d84fbb840fed02659",
"color.border.default-mode-dark": "d5825c9de6976591db713de5777bef30f2701b05",
"color.border.bold-mode-light": "6772e2a6f3e82a98e95658ad9886c337ef17b487",
"color.border.bold-mode-dark": "b0064537a61ce6d979e712de4fdc796cf8df69c6",
"color.border.bold-mode-light": "355025673d273c4da90f7bcf6b1a2ba929005285",
"color.border.bold-mode-dark": "7d180be6d024180d62b181d0bb8b401088b8fe19",
"color.border.strong-mode-light": "d901f1a7a7a8dcde66c90df2fc045309c4d570d8",
"color.border.strong-mode-dark": "5a05b11966ebd7142fbc07d048dad4c5b2c71087",
"color.border.neutral-mode-light": "72f9656241d0dd822f3cd20b8be779327fb53bbe",
Expand Down Expand Up @@ -18567,6 +18613,8 @@
"component.tabs.contained.font-weight": "300a600a237fe4b97559b7f60cb842bf9e4e6a68",
"component.tabs.contained.line-height": "70135a8cb9485089b5ba333925683c43c0b444a7",
"component.tabs.contained.letter-spacing": "4557988163e3487ca6dae85062a7c4406f6cbc50",
"component.tabs.contained.background-mode-light": "198df44f037cde8237f2f06ecac39e2ec8c36a91",
"component.tabs.contained.background-mode-dark": "7755bfa1912157a2139bb5588a205d9cc544b467",
"component.tabs.minimal.item.background-selected-mode-light": "2567d64ec6c357ad4b33addb6517efbc7fa61c23",
"component.tabs.minimal.item.background-selected-mode-dark": "4b8f324b03c4fce37f5d58c039ecc256d8419f83",
"component.tag.border-color-mode-light": "d9768a63e1a75190c1e5976f0bed6ef9dc2bc21e",
Expand Down Expand Up @@ -18773,8 +18821,8 @@
"component.table.cell.data.font-weight": "8ce8d531e856cab0d7cc24342a33445b12aeee9e",
"component.table.cell.data.line-height": "2aaf5b16746f87ffb874c75eb529a9c71983c112",
"component.table.border-radius": "8460ece4ca59b5d0783209fdb3ea18042861ffb8",
"component.textarea.default.padding-x": "42bb30661b3def3dbda34543a731cd88f3ce073f",
"component.textarea.default.padding-y": "865cb72b70ea6864b5e05747a2420af42e8fd50f",
"component.textarea.medium.padding-x": "42bb30661b3def3dbda34543a731cd88f3ce073f",
"component.textarea.medium.padding-y": "865cb72b70ea6864b5e05747a2420af42e8fd50f",
"component.textarea.large.padding-x": "7eb31ea20382c6d4ca72cc1579c1f4df7e2fdb66",
"component.textarea.large.padding-y": "12137718e5dd8eb236801cf3a764f0e6fe326eca",
"component.drawer-picker.padding-x": "cee89d16db31c7beeadf6a5c81c3b183daa4294f",
Expand Down Expand Up @@ -18857,7 +18905,7 @@
"font-weight.h6": "9b4a35b1472d74c70e35fb96c7526470d784348a",
"font-weight.eyebrow": "34160f671e75bf9f6dfa4bafdadf40bd1b63c4cd",
"font-weight.link": "875061cb2262c6cf299a9985d2c63a7a013761a7",
"component.link.hover.text-color-mode-dark": "54cab3abef3c6a61cb59396026d88bc81740dfb4"
"component.link.hover.text-color-mode-dark": "11f0ea1cbe6512e75b3c859500aea4b05507ee79"
},
"$figmaCollectionId": "VariableCollectionId:1:5",
"$figmaModeId": "1:5",
Expand Down Expand Up @@ -19005,6 +19053,7 @@
"component.rating.star.background-active": "4022d412363d5b5fcedaa68f3e2d2e576796f31f",
"component.tabs.default.border-color": "095fab8bdb383b3f815d86d32d323d99a8c31215",
"component.tabs.contained.item.background-selected": "c1641fdc922f74776369e032ca03bc2618083bec",
"component.tabs.contained.background": "700d92b5fdb0a3d56f4b7518e183ea7544489320",
"component.tabs.minimal.item.background-selected": "151b15d5631d8b85bfa706718b14175fd45a3e4b",
"component.tag.border-color": "973578214e9977dcb1c9e2482afdb0e85708f4c0",
"component.tag.warning.contrast-high.text-color": "ba20156018dfc55f864f92ad8ebcc6f3f4c43334",
Expand Down Expand Up @@ -19203,6 +19252,7 @@
"component.rating.star.background-active": "4022d412363d5b5fcedaa68f3e2d2e576796f31f",
"component.tabs.default.border-color": "095fab8bdb383b3f815d86d32d323d99a8c31215",
"component.tabs.contained.item.background-selected": "c1641fdc922f74776369e032ca03bc2618083bec",
"component.tabs.contained.background": "700d92b5fdb0a3d56f4b7518e183ea7544489320",
"component.tabs.minimal.item.background-selected": "151b15d5631d8b85bfa706718b14175fd45a3e4b",
"component.tag.border-color": "973578214e9977dcb1c9e2482afdb0e85708f4c0",
"component.tag.warning.contrast-high.text-color": "ba20156018dfc55f864f92ad8ebcc6f3f4c43334",
Expand Down
Loading