Skip to content

Commit 66b28b3

Browse files
chore: upgrading design tokens and default font size to 16px
1 parent a4505cb commit 66b28b3

File tree

6 files changed

+12
-20
lines changed

6 files changed

+12
-20
lines changed

.storybook/metamask-storybook-theme.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
export const metamaskStorybookTheme = {
33
brandTitle: 'MetaMask Storybook',
44
// Typography
5-
fontBase: 'var(--font-family-sans)',
5+
fontBase: 'var(--font-family-default)',
66
};

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
"ci-rerun-from-failed": "tsx .circleci/scripts/rerun-ci-workflow-from-failed.ts"
130130
},
131131
"resolutions": {
132+
"@metamask/design-tokens": "npm:@metamask-previews/[email protected]",
132133
"chokidar": "^3.6.0",
133134
"@types/react": "^16.9.53",
134135
"bn.js": "^5.2.1",
@@ -265,7 +266,7 @@
265266
"@metamask/browser-passworder": "^4.3.0",
266267
"@metamask/contract-metadata": "^2.5.0",
267268
"@metamask/controller-utils": "^11.4.0",
268-
"@metamask/design-tokens": "^6.0.1",
269+
"@metamask/design-tokens": "^7.0.0",
269270
"@metamask/ens-controller": "^15.0.2",
270271
"@metamask/ens-resolver-snap": "^0.1.2",
271272
"@metamask/eth-json-rpc-filters": "^9.0.0",

ui/components/component-library/text/text.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ $text-variants: (
1010
// Variable output mixin
1111
// screen size, type, size
1212
@mixin textVariables($type, $size) {
13-
font-family: var(--typography-s-#{$type}-#{$size}-font-family);
1413
font-weight: var(--typography-s-#{$type}-#{$size}-font-weight);
1514
font-size: var(--typography-s-#{$type}-#{$size}-font-size);
1615
line-height: var(--typography-s-#{$type}-#{$size}-line-height);
1716
letter-spacing: var(--typography-s-#{$type}-#{$size}-letter-spacing);
1817

1918
@include design-system.screen-md-min {
20-
font-family: var(--typography-l-#{$type}-#{$size}-font-family);
2119
font-weight: var(--typography-l-#{$type}-#{$size}-font-weight);
2220
font-size: var(--typography-l-#{$type}-#{$size}-font-size);
2321
line-height: var(--typography-l-#{$type}-#{$size}-line-height);
@@ -27,7 +25,7 @@ $text-variants: (
2725

2826
.mm-text {
2927
// Set default styles
30-
font-family: var(--font-family-sans);
28+
font-family: var(--font-family-default);
3129

3230
&:is(strong),
3331
strong {

ui/css/design-system/_typography.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use "sass:map";
22

3-
$font-family: var(--font-family-sans); // --font-family-sans from @metamask/design-tokens stylesheet
3+
$font-family: var(--font-family-default); // --font-family-default from @metamask/design-tokens stylesheet
44

55
$typography-variants: (
66
'h1': 2.5rem,

ui/pages/error-page/index.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
&__stack {
1818
max-height: 120px;
1919
overflow: auto;
20-
font-family: var(--font-family-sans);
20+
font-family: var(--font-family-default);
2121
font-weight: var(--typography-l-body-xs-font-weight);
2222
font-size: var(--typography-l-body-xs-font-size);
2323
}
@@ -29,7 +29,7 @@
2929

3030
// override styles for sentry feedback form
3131
#sentry-feedback {
32-
--font-family: var(--font-family-sans);
32+
--font-family: var(--font-family-default);
3333
--inset: auto 20px 20px auto;
3434
--input-font-size: 14px;
3535
--button-color: var(--color-primary-default);

yarn.lock

+5-12
Original file line numberDiff line numberDiff line change
@@ -5077,17 +5077,10 @@ __metadata:
50775077
languageName: node
50785078
linkType: hard
50795079

5080-
"@metamask/design-tokens@npm:^4.0.0":
5081-
version: 4.2.0
5082-
resolution: "@metamask/design-tokens@npm:4.2.0"
5083-
checksum: 10/aa92b20f8860a59b2b272e7a8a704d7e426a94030081c69c42b87ea81985c5d6585122def5906ce5a5751cb99f070efed77fabecc751ae0a7d84738f0e0ae522
5084-
languageName: node
5085-
linkType: hard
5086-
5087-
"@metamask/design-tokens@npm:^6.0.1":
5088-
version: 6.0.1
5089-
resolution: "@metamask/design-tokens@npm:6.0.1"
5090-
checksum: 10/29761650074744845551e04a701924733a4584c5c1f6099ca3c7ac5302d0ff19df697a3167034b8a70e3e5c59cb62a95c28323244583cfb3b75577e329215b7c
5080+
"@metamask/design-tokens@npm:@metamask-previews/[email protected]":
5081+
version: 6.1.0-preview.1c1a94d
5082+
resolution: "@metamask-previews/design-tokens@npm:6.1.0-preview.1c1a94d"
5083+
checksum: 10/eaf4e34f018ec29d4a4c9eb739a14bec9973a98a338e6d4795c84eb60f01b5f60b174f8f82b4cb33dda26baa6bb2b072e8a5bd41f8c9956b0c726869562cbf6e
50915084
languageName: node
50925085
linkType: hard
50935086

@@ -27217,7 +27210,7 @@ __metadata:
2721727210
"@metamask/build-utils": "npm:^3.0.0"
2721827211
"@metamask/contract-metadata": "npm:^2.5.0"
2721927212
"@metamask/controller-utils": "npm:^11.4.0"
27220-
"@metamask/design-tokens": "npm:^6.0.1"
27213+
"@metamask/design-tokens": "npm:^7.0.0"
2722127214
"@metamask/ens-controller": "npm:^15.0.2"
2722227215
"@metamask/ens-resolver-snap": "npm:^0.1.2"
2722327216
"@metamask/eslint-config": "npm:^9.0.0"

0 commit comments

Comments
 (0)