Skip to content
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

feat: font size and extension dimensions update (WIP) #29937

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+12 −19
Draft

feat: font size and extension dimensions update (WIP) #29937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55dd381
chore: updating text component to use large typography only
georgewrmarshall Jan 28, 2025
9197918
chore: updating the extension dimensions to 400x600
georgewrmarshall Jan 28, 2025
6597673
Merge branch 'main' into fix/font-size-update
georgewrmarshall Jan 28, 2025
2ee2c5c
Merge branch 'main' into fix/font-size-update
georgewrmarshall Jan 29, 2025
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
2 changes: 1 addition & 1 deletion app/popup-init.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* page may be a further UX improvement.
*/
html {
width: 357px;
width: 400px;
height: 600px;
background: #f2f4f6;
}
Expand Down
4 changes: 2 additions & 2 deletions app/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!doctype html>
<html style="width:357px; height:600px;" dir="ltr">
<html style="width:400px; height:600px;" dir="ltr">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<title>MetaMask</title>
<link rel="preload" href="/_locales/en/messages.json" as="fetch" crossorigin="anonymous" />
<link rel="stylesheet" href="../ui/css/index.scss" />
</head>
<body style="width:357px; height:600px;">
<body style="width:400px; height:600px;">
<div id="app-content">
<img class="loading-logo" src="./images/logo/metamask-fox.svg" alt="" loading="lazy" />
<img class="loading-spinner" src="./images/spinner.gif" alt="" loading="lazy" />
Expand Down
2 changes: 1 addition & 1 deletion ui/components/app/modals/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const MODALS = {
},
laptopModalStyle: {
width:
getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '357px' : '449px',
getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '400px' : '449px',
top: 'calc(33% + 45px)',
paddingLeft:
getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '16px' : null,
Expand Down
19 changes: 6 additions & 13 deletions ui/components/component-library/text/text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,14 @@ $brand-evolution-font-families: (
// screen size, type, size

@mixin textVariables($type, $size) {
font-family: var(--typography-s-#{$type}-#{$size}-font-family);
font-weight: var(--typography-s-#{$type}-#{$size}-font-weight);
font-size: var(--typography-s-#{$type}-#{$size}-font-size);
line-height: var(--typography-s-#{$type}-#{$size}-line-height);
letter-spacing: var(--typography-s-#{$type}-#{$size}-letter-spacing);

@include design-system.screen-md-min {
font-family: var(--typography-l-#{$type}-#{$size}-font-family);
font-weight: var(--typography-l-#{$type}-#{$size}-font-weight);
font-size: var(--typography-l-#{$type}-#{$size}-font-size);
line-height: var(--typography-l-#{$type}-#{$size}-line-height);
letter-spacing: var(--typography-l-#{$type}-#{$size}-letter-spacing);
}
font-family: var(--typography-l-#{$type}-#{$size}-font-family);
font-weight: var(--typography-l-#{$type}-#{$size}-font-weight);
font-size: var(--typography-l-#{$type}-#{$size}-font-size);
line-height: var(--typography-l-#{$type}-#{$size}-line-height);
letter-spacing: var(--typography-l-#{$type}-#{$size}-letter-spacing);
}


// Brand evolution font mixin
@mixin brand-evolution-font($type) {
$font-family: map-get($brand-evolution-font-families, $type);
Expand Down
2 changes: 1 addition & 1 deletion ui/components/ui/mascot/mascot.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const animationEventEmitter = new EventEmitter();

const containerStyle = {
height: '600px',
width: '357px',
width: '400px',
border: '1px solid black',
display: 'flex',
flexFlow: 'column',
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/unlock-page/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
flex-direction: column;
justify-content: flex-start;
align-items: center;
width: 357px;
width: 400px;
padding: 30px;
font-weight: 400;

Expand Down
Loading