Skip to content

Commit ae8f600

Browse files
adamlobleradamlobler
authored
Merge pull request #12 from instructure/v1.5.0
2 parents 0db8a86 + 6da6a01 commit ae8f600

8 files changed

Lines changed: 51 additions & 38 deletions

File tree

‎tokensStudio/$themes.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,6 +1146,7 @@
11461146
"badge.size": "7a45f045849363d0f93c6d05c8c2cf9b202bb9c6",
11471147
"badge.padding": "bc63d3c0bf885bffeeab07245a8d53cdaf589914",
11481148
"badge.notificationZIndex": "f89d62bdca27d3f64b26fbeef808052d78e087f6",
1149+
"badge.primaryTextColor": "aee56d6d7b28e72b7171991be0bfd39c94255fd0",
11491150
"baseButton.primaryBackground": "154f6104112592e5e0121ca1a94f1fd8143722ea",
11501151
"baseButton.primaryHoverBackground": "31516e33d4e70ef4119e9f4ccc7f42c66019e6cf",
11511152
"baseButton.primaryActiveBackground": "022fe8f12710c857dff73ac023ab0c4802b26c72",
@@ -4665,6 +4666,7 @@
46654666
"badge.size": "7a45f045849363d0f93c6d05c8c2cf9b202bb9c6",
46664667
"badge.padding": "bc63d3c0bf885bffeeab07245a8d53cdaf589914",
46674668
"badge.notificationZIndex": "f89d62bdca27d3f64b26fbeef808052d78e087f6",
4669+
"badge.primaryTextColor": "aee56d6d7b28e72b7171991be0bfd39c94255fd0",
46684670
"baseButton.primaryBackground": "154f6104112592e5e0121ca1a94f1fd8143722ea",
46694671
"baseButton.primaryHoverBackground": "31516e33d4e70ef4119e9f4ccc7f42c66019e6cf",
46704672
"baseButton.primaryActiveBackground": "022fe8f12710c857dff73ac023ab0c4802b26c72",
@@ -7374,6 +7376,7 @@
73747376
"badge.size": "7a45f045849363d0f93c6d05c8c2cf9b202bb9c6",
73757377
"badge.padding": "bc63d3c0bf885bffeeab07245a8d53cdaf589914",
73767378
"badge.notificationZIndex": "f89d62bdca27d3f64b26fbeef808052d78e087f6",
7379+
"badge.primaryTextColor": "aee56d6d7b28e72b7171991be0bfd39c94255fd0",
73777380
"baseButton.primaryActiveBackground": "022fe8f12710c857dff73ac023ab0c4802b26c72",
73787381
"baseButton.primaryActiveBorderColor": "6d648d89b527cdf9b2b275e651ba4906ad2d9df2",
73797382
"baseButton.primaryActiveTextColor": "a287571e4829822e194584e7bd82ced8a2e76f23",
@@ -10895,6 +10898,7 @@
1089510898
"badge.size": "7a45f045849363d0f93c6d05c8c2cf9b202bb9c6",
1089610899
"badge.padding": "bc63d3c0bf885bffeeab07245a8d53cdaf589914",
1089710900
"badge.notificationZIndex": "f89d62bdca27d3f64b26fbeef808052d78e087f6",
10901+
"badge.primaryTextColor": "aee56d6d7b28e72b7171991be0bfd39c94255fd0",
1089810902
"baseButton.primaryActiveBackground": "022fe8f12710c857dff73ac023ab0c4802b26c72",
1089910903
"baseButton.primaryActiveBorderColor": "6d648d89b527cdf9b2b275e651ba4906ad2d9df2",
1090010904
"baseButton.primaryActiveTextColor": "a287571e4829822e194584e7bd82ced8a2e76f23",

‎tokensStudio/canvas/component/Badge.json‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"type": "color"
3030
},
3131
"fontSize": {
32-
"value": "{semantic.fontSize.textSm}",
32+
"value": "{semantic.fontSize.textXs}",
3333
"type": "fontSizes"
3434
},
3535
"fontWeight": {
@@ -41,28 +41,32 @@
4141
"type": "sizing"
4242
},
4343
"size": {
44-
"value": "1.25rem",
44+
"value": "1rem",
4545
"type": "sizing"
4646
},
4747
"padding": {
4848
"value": "{semantic.spacing.spaceXs}",
4949
"type": "spacing"
5050
},
51-
"notificationZIndex": {
52-
"value": "1",
53-
"type": "number"
54-
},
5551
"notificationOffset": {
5652
"value": "0.125rem",
5753
"type": "other"
5854
},
55+
"notificationZIndex": {
56+
"value": 1,
57+
"type": "number"
58+
},
5959
"pulseBorderThickness": {
6060
"value": "0.125rem",
6161
"type": "other"
6262
},
6363
"countOffset": {
6464
"value": "0.5rem",
6565
"type": "other"
66+
},
67+
"primaryTextColor": {
68+
"value": "{semantic.color.text.inverse}",
69+
"type": "color"
6670
}
6771
}
68-
}
72+
}

‎tokensStudio/canvas/component/BaseButton.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@
748748
},
749749
"dangerGhostBackground": {
750750
"value": "transparent",
751-
"type": "text"
751+
"type": "color"
752752
},
753753
"dangerGhostBoxShadow": {
754754
"value": "none",
@@ -776,7 +776,7 @@
776776
},
777777
"primaryGhostBackground": {
778778
"value": "transparent",
779-
"type": "text"
779+
"type": "color"
780780
},
781781
"primaryHoverBoxShadow": {
782782
"value": "none",
@@ -788,7 +788,7 @@
788788
},
789789
"primaryInverseGhostBackground": {
790790
"value": "transparent",
791-
"type": "text"
791+
"type": "color"
792792
},
793793
"primaryInverseGhostBoxShadow": {
794794
"value": "none",
@@ -808,11 +808,11 @@
808808
},
809809
"secondaryGhostActiveBackground": {
810810
"value": "transparent",
811-
"type": "text"
811+
"type": "color"
812812
},
813813
"secondaryGhostBackground": {
814814
"value": "transparent",
815-
"type": "text"
815+
"type": "color"
816816
},
817817
"secondaryGhostBoxShadow": {
818818
"value": "none",
@@ -832,7 +832,7 @@
832832
},
833833
"successGhostBackground": {
834834
"value": "transparent",
835-
"type": "text"
835+
"type": "color"
836836
},
837837
"successGhostBoxShadow": {
838838
"value": "none",
@@ -867,4 +867,4 @@
867867
"type": "lineHeights"
868868
}
869869
}
870-
}
870+
}

‎tokensStudio/canvas/component/TruncateText.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
"fontFamily": {
44
"value": "{semantic.fontFamily.base}",
55
"type": "fontFamilies"
6-
},
7-
"lineHeight": {
8-
"value": "{semantic.lineHeight.paragraph.base}",
9-
"type": "lineHeights"
106
}
117
}
12-
}
8+
}

‎tokensStudio/rebrand/component/Badge.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"type": "color"
3030
},
3131
"fontSize": {
32-
"value": "{semantic.fontSize.textSm}",
32+
"value": "{semantic.fontSize.textXs}",
3333
"type": "fontSizes"
3434
},
3535
"fontWeight": {
@@ -41,7 +41,7 @@
4141
"type": "sizing"
4242
},
4343
"size": {
44-
"value": "1.25rem",
44+
"value": "1rem",
4545
"type": "sizing"
4646
},
4747
"padding": {
@@ -53,7 +53,7 @@
5353
"type": "other"
5454
},
5555
"notificationZIndex": {
56-
"value": "1",
56+
"value": 1,
5757
"type": "number"
5858
},
5959
"pulseBorderThickness": {
@@ -63,6 +63,10 @@
6363
"countOffset": {
6464
"value": "0.5rem",
6565
"type": "other"
66+
},
67+
"primaryTextColor": {
68+
"value": "{semantic.color.text.inverse}",
69+
"type": "color"
6670
}
6771
}
6872
}

‎tokensStudio/rebrand/component/BaseButton.json‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"studio.tokens": {
6262
"modify": {
6363
"type": "alpha",
64-
"value": "0.1",
64+
"value": "0.2",
6565
"space": "hsl"
6666
}
6767
}
@@ -74,7 +74,7 @@
7474
"studio.tokens": {
7575
"modify": {
7676
"type": "alpha",
77-
"value": "0.2",
77+
"value": "0.4",
7878
"space": "hsl"
7979
}
8080
}
@@ -91,7 +91,7 @@
9191
"studio.tokens": {
9292
"modify": {
9393
"type": "alpha",
94-
"value": "0.05",
94+
"value": "0.1",
9595
"space": "hsl"
9696
}
9797
}
@@ -257,6 +257,15 @@
257257
"secondaryGhostBorderColor": {
258258
"value": "{semantic.color.institutional.brandButtonSecondaryText}",
259259
"type": "color",
260+
"$extensions": {
261+
"studio.tokens": {
262+
"modify": {
263+
"type": "alpha",
264+
"value": "0.2",
265+
"space": "hsl"
266+
}
267+
}
268+
},
260269
"description": "This token is not used in design, kept only for backward compatibility reasons."
261270
},
262271
"secondaryGhostColor": {
@@ -739,7 +748,7 @@
739748
},
740749
"dangerGhostBackground": {
741750
"value": "transparent",
742-
"type": "text"
751+
"type": "color"
743752
},
744753
"dangerGhostBoxShadow": {
745754
"value": "none",
@@ -767,7 +776,7 @@
767776
},
768777
"primaryGhostBackground": {
769778
"value": "transparent",
770-
"type": "text"
779+
"type": "color"
771780
},
772781
"primaryHoverBoxShadow": {
773782
"value": "none",
@@ -779,7 +788,7 @@
779788
},
780789
"primaryInverseGhostBackground": {
781790
"value": "transparent",
782-
"type": "text"
791+
"type": "color"
783792
},
784793
"primaryInverseGhostBoxShadow": {
785794
"value": "none",
@@ -799,11 +808,11 @@
799808
},
800809
"secondaryGhostActiveBackground": {
801810
"value": "transparent",
802-
"type": "text"
811+
"type": "color"
803812
},
804813
"secondaryGhostBackground": {
805814
"value": "transparent",
806-
"type": "text"
815+
"type": "color"
807816
},
808817
"secondaryGhostBoxShadow": {
809818
"value": "none",
@@ -823,7 +832,7 @@
823832
},
824833
"successGhostBackground": {
825834
"value": "transparent",
826-
"type": "text"
835+
"type": "color"
827836
},
828837
"successGhostBoxShadow": {
829838
"value": "none",
@@ -858,4 +867,4 @@
858867
"type": "lineHeights"
859868
}
860869
}
861-
}
870+
}

‎tokensStudio/rebrand/component/TruncateText.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
"fontFamily": {
44
"value": "{semantic.fontFamily.base}",
55
"type": "fontFamilies"
6-
},
7-
"lineHeight": {
8-
"value": "{semantic.lineHeight.paragraph.base}",
9-
"type": "lineHeights"
106
}
117
}
12-
}
8+
}

‎tokensStudio/rebrand/semantic/color/rebrandLight.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@
21242124
"type": "color"
21252125
},
21262126
"globalNavLinkHover": {
2127-
"value": "{color.grey.grey170}",
2127+
"value": "{color.navy.navy10}",
21282128
"type": "color"
21292129
},
21302130
"brandGlobalNavMenuItemTextColor": {

0 commit comments

Comments
 (0)