Skip to content

[www] Standardize and consolidate font setup #13519

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
parlough merged 1 commit into from
Jun 18, 2026
Merged

[www] Standardize and consolidate font setup #13519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 4 additions & 14 deletions sites/www/lib/src/layouts/default_layout.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,29 +99,19 @@ class DefaultLayout extends PageLayout {
attributes: {'crossorigin': ''},
),

// Flutter Fonts
// Set up site fonts and icons.
const link(
href:
'https://fonts.googleapis.com/css?family=Google+Sans:400,500,700',
rel: 'stylesheet',
attributes: {'media': 'all'},
),
const link(
href:
'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700',
rel: 'stylesheet',
attributes: {'media': 'all'},
),
const link(
href:
'https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@400;500&display=swap',
'https://fonts.googleapis.com/css2?family=Google+Sans+Flex:opsz,wght@6..120,400..700&family=Google+Sans+Code:ital,wght@0,400..700;1,400..700&display=swap',
rel: 'stylesheet',
),
const link(
href:
'https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@20..48,400,0..1,0&display=block',
rel: 'stylesheet',
),

// Set up standard cookie notification bar.
const link(
href:
'https://www.gstatic.com/glue/cookienotificationbar/cookienotificationbar.min.css',
Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ button {
color: var(--blue-6);
cursor: pointer;
display: inline-flex;
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-size: var(--font-size-default);
font-weight: var(--font-weight-bold);
height: var(--ui-btn-height);
Expand Down
4 changes: 2 additions & 2 deletions sites/www/lib/styles/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}

span {
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-size: var(--font-size-heading-5);
color: var(--grey-6);
}
Expand Down Expand Up @@ -122,7 +122,7 @@
width: 100%;

ul {
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-size: var(--font-size-heading-5);
display: inline-block;
margin-left: 1rem;
Expand Down
10 changes: 5 additions & 5 deletions sites/www/lib/styles/components/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
color: white;
font-size: var(--font-size-default);
font-weight: var(--font-weight-bold);
font-family: var(--font-gsans);
font-family: var(--font-ui);

.event-bar__content {
display: none;
Expand Down Expand Up @@ -121,7 +121,7 @@
display: flex;
text-wrap: nowrap;
list-style: none;
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-weight: var(--font-weight-bold);
font-size: var(--font-size-heading-4);

Expand Down Expand Up @@ -196,7 +196,7 @@
padding: 0 8px;
background-color: transparent;
border: none;
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-weight: var(--font-weight-bold);
font-size: var(--font-size-default);
color: white;
Expand Down Expand Up @@ -345,7 +345,7 @@
color: var(--grey-2);
padding: 9px 16px;
display: inline-block; /* not full width bg */
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);
height: auto;

/* TODO consolidate these because of new mobile dropdown */
Expand Down Expand Up @@ -496,7 +496,7 @@
padding: var(--spacer-sm) 16px;
display: flex;
justify-content: flex-start;
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);

&.active,
&:active,
Expand Down
4 changes: 2 additions & 2 deletions sites/www/lib/styles/components/_hero.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ body.interior {
}
}
}

h2 {
font-size: var(--font-size-heading-2);
font-weight: 400;
font-weight: var(--font-weight-normal);
max-width: 925px;
margin: var(--gutter-lg) auto var(--spacer);
}
Expand Down
8 changes: 4 additions & 4 deletions sites/www/lib/styles/components/_insert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
h3 {
font-size: var(--font-size-heading-2);
margin-bottom: var(--gutter-sm);
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);
max-width: 820px;
}

Expand Down Expand Up @@ -164,8 +164,8 @@
&.try-flutter-insert {
background-image: linear-gradient(to right, #b993f4, #53c0f9, #00f0ea);
border-radius: 40px;
font-family: var(--font-gsans);
font-family: var(--font-ui);

.text {
h2 {
font-size: 48px;
Expand All @@ -181,7 +181,7 @@
background-color: #ffffff;
border-color: #ffffff;
color: #6a1ff4 !important;
font-weight: 700;
font-weight: var(--font-weight-bold);
margin-right: var(--gutter-sm);
}

Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/components/_map.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

h4 {
font-size: 14px;
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);
margin-bottom: var(--spacer-sm);
color: var(--primary);
}
Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/components/_notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.notification {
.notification-message {
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-size: var(--font-size-heading-4);
background-color: var(--blue-6);
border-radius: 6px;
Expand Down
12 changes: 6 additions & 6 deletions sites/www/lib/styles/components/_stories.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ section#stories {

> h2 {
font-size: var(--font-size-heading-2);
font-weight: 400;
font-weight: var(--font-weight-normal);
max-width: 950px;
margin: 0 auto var(--gutter-md);
}
Expand Down Expand Up @@ -137,16 +137,16 @@ section#stories {

> div {
max-width: 195px;

h4 {
font-size: 54px;
margin-bottom: var(--spacer-sm);
}

h3 {
font-family: var(--font-roboto);
font-family: var(--font-body);
font-size: var(--font-size-heading-4);
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);
}
}
}
Expand Down Expand Up @@ -223,7 +223,7 @@ section#stories {

h4 {
font-size: 14px;
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);
margin-bottom: 14px;
}

Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/components/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

h2 {
font-size: 32px;
font-weight: 400;
font-weight: var(--font-weight-normal);
max-width: 800px;
margin-bottom: 45px;
}
Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/components/_testimonial.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

.testimonial-quote {
font-family: var(--font-gsans);
font-family: var(--font-ui);

blockquote {
p {
Expand Down
10 changes: 5 additions & 5 deletions sites/www/lib/styles/core/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ body {
display: flex;
flex-direction: column;
line-height: inherit;
font-family: var(--font-roboto);
font-family: var(--font-body);
font-size: var(--font-size-default);
font-weight: var(--font-weight-default);
font-weight: var(--font-weight-normal);
margin: 0;
padding: 0;
-webkit-font-smoothing: antialiased;
Expand All @@ -20,8 +20,8 @@ body {
code,
kbd,
pre {
font-family: 'Google Sans Mono', 'Roboto Mono', ui-monospace, 'SFMono-Regular', monospace;
font-size: 1em;
font-family: var(--font-code);
font-size: 1em;
}

h1,
Expand All @@ -30,7 +30,7 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-gsans);
font-family: var(--font-ui);
line-height: 1.2;
letter-spacing: -0.005em;
font-weight: var(--font-weight-bold);
Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/core/_reset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ html {

b,
strong {
font-weight: bolder;
font-weight: 600;
Comment thread
parlough marked this conversation as resolved.
}

button,
Expand Down
11 changes: 6 additions & 5 deletions sites/www/lib/styles/core/_vars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@
--font-size-default: 14px;
--font-size-scaling-2: calc(88 * 100vw / 1440);
--font-size-scaling-3: calc(72 * 100vw / 1440);
--font-weight-default: 400;
--font-weight-bold: 700;
--font-gsans: 'Google Sans', ui-sans, sans-serif;
--font-roboto: 'Roboto', sans-serif;
--font-roboto-mono: 'Roboto Mono', monospace;
--font-weight-normal: 400;
--font-weight-bold: 600;
--font-weight-bolder: 700;
--font-ui: 'Google Sans Flex', 'Roboto', ui-sans, sans-serif;
--font-body: 'Google Sans Flex', 'Roboto', ui-sans, sans-serif;
--font-code: 'Google Sans Code', 'Roboto Mono', ui-monospace, monospace;

--screen-xs-min: 480px; /* mobile portrait */
--screen-sm-min: 640px; /* mobile landscape */
Expand Down
8 changes: 4 additions & 4 deletions sites/www/lib/styles/pages/_brand.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ body.brand {

.btn.quiet {
color: white !important;
font-weight: 400;
font-weight: var(--font-weight-normal);

&:hover {
text-decoration: underline;
Expand Down Expand Up @@ -202,11 +202,11 @@ body.brand {

.compare-label {
padding: var(--spacer-sm) 0;
font-weight: 400;
font-weight: var(--font-weight-normal);
font-size: var(----font-size-default);

span {
font-weight: 700;
font-weight: var(--font-weight-bolder);
}

&.good {
Expand Down Expand Up @@ -525,7 +525,7 @@ body.brand {

h5 {
font-size: 14px;
font-weight: 400;
font-weight: var(--font-weight-normal);
color: var(--grey-6);
}
}
Expand Down
2 changes: 1 addition & 1 deletion sites/www/lib/styles/pages/_buildWithAI.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ body.buildWithAI {

h2 {
font-size: 32px;
font-weight: 400;
font-weight: var(--font-weight-normal);
max-width: 800px;
margin: 0 auto 45px;
text-align: center;
Expand Down
6 changes: 3 additions & 3 deletions sites/www/lib/styles/pages/_community.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ body.community {
margin-top: 8px;
margin-bottom: 32px;
font-size: 20px;
font-family: var(--font-roboto);
font-family: var(--font-body);
color: var(--grey-6);
line-height: 30px;
font-weight: 400;
font-weight: var(--font-weight-normal);
}
}
}
Expand Down Expand Up @@ -86,7 +86,7 @@ body.community {
}

span {
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-size: var(--font-size-heading-5);
color: var(--grey-6);
}
Expand Down
6 changes: 3 additions & 3 deletions sites/www/lib/styles/pages/_culture.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ body.culture {
font-weight: var(--font-weight-bold);
margin-bottom: var(--gutter-sm);
}

> p {
font-family: var(--font-gsans);
font-family: var(--font-ui);
font-size: var(--font-size-heading-3);
margin-bottom: var(--gutter);
}

> h3 {
font-size: var(--font-size-heading-3);
font-weight: var(--font-weight-bold);
Expand Down
8 changes: 4 additions & 4 deletions sites/www/lib/styles/pages/_development.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ body.development {

.flutter-stat-cta__number {
font-size: 3rem; /* 48px */
font-weight: bold;
font-weight: var(--font-weight-bold);
color: #fff;
}

Expand All @@ -104,7 +104,7 @@ body.development {
}

&.ios section {
font-family: var(--font-gsans);
font-family: var(--font-ui);

.title {
font-size: 48px;
Expand All @@ -121,10 +121,10 @@ body.development {

.body {
font-size: 20px;
font-family: var(--font-roboto);
font-family: var(--font-body);
color: var(--grey-6);
line-height: 30px;
font-weight: 400;
font-weight: var(--font-weight-normal);
margin-bottom: 40px;
}

Expand Down
Loading
Loading