Skip to content

[docs] Consolidate to flex versions of Google Sans fonts #13518

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
sfshaza2 merged 2 commits into from
Jun 18, 2026
Merged

[docs] Consolidate to flex versions of Google Sans fonts #13518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b58ac
[docs] Consolidate to flex versions of Google Sans fonts
parlough Jun 18, 2026
18d946b
Merge branch 'main' into feat/docs-simplify-font-setup
parlough Jun 18, 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
2 changes: 1 addition & 1 deletion packages/site_shared/lib/_sass/components/_site-switcher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
font-size: 1.75rem;
line-height: 1.25em;
letter-spacing: 0.015em;
font-family: 'Google Sans', sans-serif;
font-family: var(--site-ui-fontFamily);
user-select: none;

>img {
Expand Down
2 changes: 1 addition & 1 deletion packages/site_shared/lib/_sass/components/_summary-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
h3 {
margin: 0;
font-size: 1.25rem;
font-weight: 700;
font-weight: 600;
color: var(--site-base-fgColor);
}

Expand Down
12 changes: 6 additions & 6 deletions packages/site_shared/lib/src/layouts/dash_layout.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ abstract class DashLayout implements PageLayout {
({Set<String> prerender, Set<String> prefetch}) speculationUrls(Page page) =>
const (prerender: {}, prefetch: {});

List<String> get fonts => [
'https://fonts.googleapis.com/css2?family=Google+Sans:wght@400;500;700&display=swap',
'https://fonts.googleapis.com/css2?family=Google+Sans+Mono:wght@400;500;700&display=swap',
'https://fonts.googleapis.com/css2?family=Google+Sans+Text:wght@400;500;700&display=swap',
/// Font stylesheet URLs to load in the document head before site styles.
///
/// Override this to add, remove, or replace site-level font resources.
List<String> get fontUrls => const [
'https://fonts.googleapis.com/css2?family=Google+Sans+Flex:opsz,wght@6..72,400..700&family=Google+Sans+Code:ital,wght@0,400..700;1,400..700&display=swap',
'https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0..1,0',
'https://fonts.googleapis.com/css2?family=Noto+Serif:ital,wght@0,100..900;1,100..900&display=swap',
];
Comment thread
parlough marked this conversation as resolved.

String get stylesHash;
Expand Down Expand Up @@ -142,7 +142,7 @@ abstract class DashLayout implements PageLayout {
href: 'https://fonts.gstatic.com',
attributes: {'crossorigin': ''},
),
for (final font in fonts) link(rel: 'stylesheet', href: font),
for (final font in fontUrls) link(rel: 'stylesheet', href: font),

// Set site styles.
link(
Expand Down
7 changes: 4 additions & 3 deletions sites/docs/lib/_sass/base/_root.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ $base_primary_color: #0468D7;
// Root variables shared by both light and dark mode.
body {
// Site typography.
--site-ui-fontFamily: 'Google Sans', 'Roboto', ui-sans, sans-serif;
--site-body-fontFamily: 'Google Sans Text', 'Roboto', ui-sans, sans-serif;
--site-code-fontFamily: 'Google Sans Mono', 'Roboto Mono', ui-monospace, monospace;
--site-ui-fontFamily: 'Google Sans Flex', 'Roboto', ui-sans, sans-serif;
--site-body-fontFamily: 'Google Sans Flex', 'Roboto', ui-sans, sans-serif;
--site-code-fontFamily: 'Google Sans Code', 'Roboto Mono', ui-monospace, monospace;
--site-icon-fontFamily: 'Material Symbols Outlined', 'Material Symbols', 'Material Icons';
font-optical-sizing: auto;

// Site layout sizes.
--site-header-height: 4rem;
Expand Down
2 changes: 1 addition & 1 deletion sites/docs/lib/_sass/components/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ main {

b,
strong {
font-weight: bolder;
font-weight: 600;
}

h1,
Expand Down
2 changes: 1 addition & 1 deletion sites/docs/lib/_sass/components/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}

.nav-header {
font-weight: bolder;
font-weight: 650;
font-size: 1rem;
padding: 0.25rem 0.4rem 0;
color: var(--site-base-fgColor-lighter);
Expand Down
2 changes: 1 addition & 1 deletion sites/docs/lib/_sass/pages/_learning-resources-index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
color: var(--site-base-fgColor-alt);
background-color: var(--site-raised-bgColor);
font-family: var(--site-ui-fontFamily);
font-weight: 700;
font-weight: 600;
font-size: .925rem;
padding: .5rem;
border-bottom: 1px solid var(--site-inset-borderColor);
Expand Down
Loading