diff --git a/sites/www/lib/src/layouts/default_layout.dart b/sites/www/lib/src/layouts/default_layout.dart index 4628a13165..cd1f05e835 100644 --- a/sites/www/lib/src/layouts/default_layout.dart +++ b/sites/www/lib/src/layouts/default_layout.dart @@ -99,22 +99,10 @@ 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( @@ -122,6 +110,8 @@ class DefaultLayout extends PageLayout { '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', diff --git a/sites/www/lib/styles/components/_button.scss b/sites/www/lib/styles/components/_button.scss index 36cf84f88a..7e2bb6a3c3 100644 --- a/sites/www/lib/styles/components/_button.scss +++ b/sites/www/lib/styles/components/_button.scss @@ -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); diff --git a/sites/www/lib/styles/components/_footer.scss b/sites/www/lib/styles/components/_footer.scss index d92375e624..99e51357de 100644 --- a/sites/www/lib/styles/components/_footer.scss +++ b/sites/www/lib/styles/components/_footer.scss @@ -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); } @@ -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; diff --git a/sites/www/lib/styles/components/_header.scss b/sites/www/lib/styles/components/_header.scss index ba2dce7944..88f76c1b90 100644 --- a/sites/www/lib/styles/components/_header.scss +++ b/sites/www/lib/styles/components/_header.scss @@ -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; @@ -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); @@ -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; @@ -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 */ @@ -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, diff --git a/sites/www/lib/styles/components/_hero.scss b/sites/www/lib/styles/components/_hero.scss index 186de3712a..4e01c9625e 100644 --- a/sites/www/lib/styles/components/_hero.scss +++ b/sites/www/lib/styles/components/_hero.scss @@ -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); } diff --git a/sites/www/lib/styles/components/_insert.scss b/sites/www/lib/styles/components/_insert.scss index c9a039ab90..f440f11dd1 100644 --- a/sites/www/lib/styles/components/_insert.scss +++ b/sites/www/lib/styles/components/_insert.scss @@ -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; } @@ -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; @@ -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); } diff --git a/sites/www/lib/styles/components/_map.scss b/sites/www/lib/styles/components/_map.scss index 758b2464a8..4d624d049f 100644 --- a/sites/www/lib/styles/components/_map.scss +++ b/sites/www/lib/styles/components/_map.scss @@ -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); } diff --git a/sites/www/lib/styles/components/_notification.scss b/sites/www/lib/styles/components/_notification.scss index 24f2ac30e9..6cfe600e03 100644 --- a/sites/www/lib/styles/components/_notification.scss +++ b/sites/www/lib/styles/components/_notification.scss @@ -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; diff --git a/sites/www/lib/styles/components/_stories.scss b/sites/www/lib/styles/components/_stories.scss index d6986e1f5b..fd4221c14c 100644 --- a/sites/www/lib/styles/components/_stories.scss +++ b/sites/www/lib/styles/components/_stories.scss @@ -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); } @@ -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); } } } @@ -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; } diff --git a/sites/www/lib/styles/components/_tabs.scss b/sites/www/lib/styles/components/_tabs.scss index da97d84914..0bee5e36aa 100644 --- a/sites/www/lib/styles/components/_tabs.scss +++ b/sites/www/lib/styles/components/_tabs.scss @@ -20,7 +20,7 @@ h2 { font-size: 32px; - font-weight: 400; + font-weight: var(--font-weight-normal); max-width: 800px; margin-bottom: 45px; } diff --git a/sites/www/lib/styles/components/_testimonial.scss b/sites/www/lib/styles/components/_testimonial.scss index 49e44198a2..b4a265a70e 100644 --- a/sites/www/lib/styles/components/_testimonial.scss +++ b/sites/www/lib/styles/components/_testimonial.scss @@ -43,7 +43,7 @@ } .testimonial-quote { - font-family: var(--font-gsans); + font-family: var(--font-ui); blockquote { p { diff --git a/sites/www/lib/styles/core/_base.scss b/sites/www/lib/styles/core/_base.scss index 43161bcb6f..8c16e6cfc9 100644 --- a/sites/www/lib/styles/core/_base.scss +++ b/sites/www/lib/styles/core/_base.scss @@ -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; @@ -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, @@ -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); diff --git a/sites/www/lib/styles/core/_reset.scss b/sites/www/lib/styles/core/_reset.scss index cdd98745a5..cf9014fece 100644 --- a/sites/www/lib/styles/core/_reset.scss +++ b/sites/www/lib/styles/core/_reset.scss @@ -24,7 +24,7 @@ html { b, strong { - font-weight: bolder; + font-weight: 600; } button, diff --git a/sites/www/lib/styles/core/_vars.scss b/sites/www/lib/styles/core/_vars.scss index abb096f3de..db0d7aae0d 100644 --- a/sites/www/lib/styles/core/_vars.scss +++ b/sites/www/lib/styles/core/_vars.scss @@ -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 */ diff --git a/sites/www/lib/styles/pages/_brand.scss b/sites/www/lib/styles/pages/_brand.scss index 7047297eba..053bb840cd 100644 --- a/sites/www/lib/styles/pages/_brand.scss +++ b/sites/www/lib/styles/pages/_brand.scss @@ -41,7 +41,7 @@ body.brand { .btn.quiet { color: white !important; - font-weight: 400; + font-weight: var(--font-weight-normal); &:hover { text-decoration: underline; @@ -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 { @@ -525,7 +525,7 @@ body.brand { h5 { font-size: 14px; - font-weight: 400; + font-weight: var(--font-weight-normal); color: var(--grey-6); } } diff --git a/sites/www/lib/styles/pages/_buildWithAI.scss b/sites/www/lib/styles/pages/_buildWithAI.scss index 4120965b1a..284df7148c 100644 --- a/sites/www/lib/styles/pages/_buildWithAI.scss +++ b/sites/www/lib/styles/pages/_buildWithAI.scss @@ -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; diff --git a/sites/www/lib/styles/pages/_community.scss b/sites/www/lib/styles/pages/_community.scss index 6ae2e2ca5d..788403c1b6 100644 --- a/sites/www/lib/styles/pages/_community.scss +++ b/sites/www/lib/styles/pages/_community.scss @@ -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); } } } @@ -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); } diff --git a/sites/www/lib/styles/pages/_culture.scss b/sites/www/lib/styles/pages/_culture.scss index a943af09a9..74b0393974 100644 --- a/sites/www/lib/styles/pages/_culture.scss +++ b/sites/www/lib/styles/pages/_culture.scss @@ -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); diff --git a/sites/www/lib/styles/pages/_development.scss b/sites/www/lib/styles/pages/_development.scss index a2ad960c7b..8b8fb21127 100644 --- a/sites/www/lib/styles/pages/_development.scss +++ b/sites/www/lib/styles/pages/_development.scss @@ -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; } @@ -104,7 +104,7 @@ body.development { } &.ios section { - font-family: var(--font-gsans); + font-family: var(--font-ui); .title { font-size: 48px; @@ -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; } diff --git a/sites/www/lib/styles/pages/_events.scss b/sites/www/lib/styles/pages/_events.scss index 3cea87a073..cfdcd73114 100644 --- a/sites/www/lib/styles/pages/_events.scss +++ b/sites/www/lib/styles/pages/_events.scss @@ -128,7 +128,7 @@ body.events { text-align: center; span { - font-weight: 400; + font-weight: var(--font-weight-normal); color: var(--grey-6); } } @@ -256,4 +256,4 @@ body.events { } } } -} \ No newline at end of file +} diff --git a/sites/www/lib/styles/pages/_games.scss b/sites/www/lib/styles/pages/_games.scss index 6c0f41af7f..2482d9b181 100644 --- a/sites/www/lib/styles/pages/_games.scss +++ b/sites/www/lib/styles/pages/_games.scss @@ -248,7 +248,7 @@ body.games { .tabs { .tabs-title { color: var(--grey-1); - font-weight: 400; + font-weight: var(--font-weight-normal); text-align: left; font-size: 24px; line-height: 32px; @@ -368,7 +368,7 @@ body.games { .title { font-size: 24px; line-height: 36px; - font-weight: 700; + font-weight: var(--font-weight-bold); margin-bottom: 24px; @include breakpoints.screen(lg) { @@ -898,8 +898,8 @@ body.games { p { color: var(--grey-3); - font-weight: 700; - font-family: var(--font-gsans); + font-weight: var(--font-weight-bold); + font-family: var(--font-ui); margin-bottom: 0; @include breakpoints.screen(lg) { @@ -961,8 +961,8 @@ body.games { p { line-height: 24px; - font-weight: 400; - font-family: var(--font-roboto); + font-weight: var(--font-weight-normal); + font-family: var(--font-body); } } } @@ -1181,7 +1181,7 @@ body.games { 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; } diff --git a/sites/www/lib/styles/pages/_home.scss b/sites/www/lib/styles/pages/_home.scss index d93f6eb440..52c0f2a52f 100644 --- a/sites/www/lib/styles/pages/_home.scss +++ b/sites/www/lib/styles/pages/_home.scss @@ -74,7 +74,7 @@ body.home { h2 { font-size: var(--font-size-heading-2); - font-weight: 400; + font-weight: var(--font-weight-normal); color: white; max-width: 880px; margin: 0 auto 40px; diff --git a/sites/www/lib/styles/pages/_majorEvents.scss b/sites/www/lib/styles/pages/_majorEvents.scss index abe918df9c..6d45277afb 100644 --- a/sites/www/lib/styles/pages/_majorEvents.scss +++ b/sites/www/lib/styles/pages/_majorEvents.scss @@ -466,7 +466,7 @@ margin: 64px 0; font-size: 34px; line-height: 40px; - font-weight: var(--font-weight-default); + font-weight: var(--font-weight-normal); } .schedule-container { @@ -488,7 +488,7 @@ h3 { font-size: 28px; line-height: 34px; - font-weight: var(--font-weight-default); + font-weight: var(--font-weight-normal); color: var(--grey-6); margin: 0 0 8px 0; min-width: 198px; @@ -505,7 +505,7 @@ h4 { font-size: 20px; line-height: 24px; - font-weight: var(--font-weight-default); + font-weight: var(--font-weight-normal); color: var(--grey-6); } @@ -691,7 +691,7 @@ h3 { font-size: 28px; line-height: 34px; - font-weight: 700; + font-weight: var(--font-weight-bold); } p { @@ -1060,12 +1060,12 @@ left: 50%; transform: translate(-50%, -50%); transition: top 0.5s cubic-bezier(.47,1.64,.41,.8), opacity 0.2s ease-in-out; - + color: white; font-size: 40px; line-height: 60px; } - + .day-badge { width: fit-content; height: fit-content; @@ -1086,7 +1086,7 @@ font-size: 40px; line-height: 34px; - font-weight: 700; + font-weight: var(--font-weight-bold); color: #041e3c; img { @@ -1181,7 +1181,7 @@ margin-bottom: 32px; text-align: left; - font-weight: 700; + font-weight: var(--font-weight-bold); font-size: 28px; line-height: 34px; } @@ -1189,7 +1189,7 @@ p { padding: 0; - font-weight: 400; + font-weight: var(--font-weight-normal); font-size: 16px; line-height: 24px; margin-bottom: 0; @@ -1419,7 +1419,7 @@ margin: 80px 0; font-size: 40px; line-height: 56px; - font-weight: var(--font-weight-default); + font-weight: var(--font-weight-normal); } .schedule-container { @@ -1441,7 +1441,7 @@ h3 { font-size: 28px; line-height: 34px; - font-weight: var(--font-weight-default); + font-weight: var(--font-weight-normal); color: var(--grey-6); } @@ -1454,7 +1454,7 @@ h4 { font-size: 20px; line-height: 24px; - font-weight: var(--font-weight-default); + font-weight: var(--font-weight-normal); color: var(--grey-6); } @@ -1537,7 +1537,7 @@ > h3 { font-size: 60px; line-height: 60px; - font-weight: 700; + font-weight: var(--font-weight-bold); } } } diff --git a/sites/www/lib/styles/pages/_monetization.scss b/sites/www/lib/styles/pages/_monetization.scss index 1bbd503492..1041d04c6e 100644 --- a/sites/www/lib/styles/pages/_monetization.scss +++ b/sites/www/lib/styles/pages/_monetization.scss @@ -24,7 +24,7 @@ body.monetization { .tabs { .tabs-title { - font-weight: 400; + font-weight: var(--font-weight-normal); text-align: left; font-size: 24px; line-height: 32px; @@ -137,7 +137,7 @@ body.monetization { .title { font-size: 24px; line-height: 36px; - font-weight: 700; + font-weight: var(--font-weight-bold); margin-bottom: 24px; @include breakpoints.screen(lg) { diff --git a/sites/www/lib/styles/pages/_news.scss b/sites/www/lib/styles/pages/_news.scss index 5a2c2b857d..2e11e42222 100644 --- a/sites/www/lib/styles/pages/_news.scss +++ b/sites/www/lib/styles/pages/_news.scss @@ -7,9 +7,8 @@ body.news { padding-top: var(--gutter) !important; padding-bottom: var(--gutter) !important; - @include breakpoints.screen(lg) { - .container { + .container { > h2 { max-width: 600px !important; margin-top: var(--spacer) !important; @@ -26,12 +25,12 @@ body.news { h1 { max-width: 100%; font-size: 64px; - font-weight: 700; + font-weight: var(--font-weight-bold); line-height: 72px; } h2 { - font-weight: 400; + font-weight: var(--font-weight-normal); font-size: 34px; line-height: 40px; } diff --git a/sites/www/lib/styles/pages/_partner.scss b/sites/www/lib/styles/pages/_partner.scss index 59b41cdea2..4bfb111566 100644 --- a/sites/www/lib/styles/pages/_partner.scss +++ b/sites/www/lib/styles/pages/_partner.scss @@ -1,7 +1,7 @@ @use '../core/breakpoints'; body.partner { - font-family: var(--font-roboto); + font-family: var(--font-body); #notification.module { background-color: var(--grey-1); @@ -16,17 +16,17 @@ body.partner { width: 90%; h2 { - font-family: var(--font-gsans); + font-family: var(--font-ui); margin: 0 !important; font-size: 2.625rem !important; - font-weight: 700 !important; + font-weight: var(--font-weight-bolder) !important; font-style: normal; } p { margin: 1.5rem 0 0; font-size: 1.5rem; - font-weight: 400; + font-weight: var(--font-weight-normal); font-style: normal; } } @@ -47,7 +47,7 @@ body.partner { // Bold everything after the "PILOT AND AMENDMENTS" paragraph. section.content p:nth-child(n+4) { - font-weight: 700; + font-weight: var(--font-weight-bold); } } @@ -56,15 +56,15 @@ body.partner { margin: 0 auto; h3 { - font-family: var(--font-gsans); + font-family: var(--font-ui); font-size: 1.5rem; font-style: normal; - font-weight: 700; + font-weight: var(--font-weight-bold); margin-bottom: 1.5rem; } p { - font-family: var(--font-roboto); + font-family: var(--font-body); line-height: 1.5rem; font-size: 1rem; margin-bottom: 1.75rem;