diff --git a/client/src/components/Donation/donation.css b/client/src/components/Donation/donation.css index 2bb6675f6e1..0b17471b7b0 100644 --- a/client/src/components/Donation/donation.css +++ b/client/src/components/Donation/donation.css @@ -242,12 +242,10 @@ li.disabled > a { color: var(--gray-15) !important; } -.donate-page-wrapper, -.donate-page-wrapper b, +.donate-page-wrapper h2, .donate-page-wrapper h3, -.donate-page-wrapper p, [name='payment-method'] { - font-family: 'Lato', sans-serif; + font-family: var(--font-family-sans-serif); } @media (max-width: 400px) { @@ -278,10 +276,6 @@ li.disabled > a { } } -.donation-modal { - font-family: 'Lato', sans-serif; -} - .donation-modal .btn-link:focus { outline-width: 1px; outline-style: solid; @@ -489,7 +483,6 @@ a.patreon-button:hover { } .form-status p { - font-family: 'Lato', sans-serif; font-size: 16px; color: #eb1c26; text-align: left; diff --git a/client/src/components/Footer/footer.css b/client/src/components/Footer/footer.css index 730b1096829..9b89b2a95e3 100644 --- a/client/src/components/Footer/footer.css +++ b/client/src/components/Footer/footer.css @@ -6,7 +6,6 @@ color: var(--tertiary-color); background: var(--tertiary-background); line-height: 1.6; - font-family: 'Lato', sans-serif; } .footer-container { @@ -19,7 +18,6 @@ .footer-container p { margin: 0 0 1.45rem; line-height: 30px; - font-family: 'Lato', sans-serif; font-size: 16px; } @@ -39,7 +37,6 @@ text-align: center; padding: 0 15px 15px; margin-bottom: 0; - font-family: Lato, sans-serif; } .footer-row { diff --git a/client/src/components/FourOhFour/404.css b/client/src/components/FourOhFour/404.css index ef87fe44c3f..967aeb80e92 100644 --- a/client/src/components/FourOhFour/404.css +++ b/client/src/components/FourOhFour/404.css @@ -33,7 +33,6 @@ font-size: 50px; font-weight: 700; color: var(--tertiary-color); - font-family: 'Arial', sans-serif; font-style: normal; padding-inline-start: 15px; padding-top: 5px; diff --git a/client/src/components/Header/components/universal-nav.css b/client/src/components/Header/components/universal-nav.css index 83d8dec691c..65dfe76748f 100644 --- a/client/src/components/Header/components/universal-nav.css +++ b/client/src/components/Header/components/universal-nav.css @@ -3,7 +3,6 @@ justify-content: space-between; align-items: flex-start; font-size: 18px; - font-family: 'Lato', sans-serif; height: var(--header-height); background: var(--theme-color); position: fixed; @@ -326,7 +325,6 @@ button.nav-link[aria-disabled='true'] { .toggle-button-nav { padding: 2px 14px; border: 1px solid var(--gray-00); - font-family: 'lato', sans-serif; font-size: 18px; color: var(--gray-00); background-color: var(--theme-color); @@ -436,7 +434,6 @@ button.nav-link[aria-disabled='true'] { max-height: calc(var(--header-height) - 6px); padding: 4px 12px; margin-inline-start: 2px; - font-family: 'Hack-ZeroSlash', monospace; display: flex; align-items: center; justify-content: center; diff --git a/client/src/components/Intro/intro.css b/client/src/components/Intro/intro.css index 8092fa210ec..f495ed716b7 100644 --- a/client/src/components/Intro/intro.css +++ b/client/src/components/Intro/intro.css @@ -26,7 +26,6 @@ .intro-description strong, .intro-description p { - font-family: 'Lato', sans-serif; font-size: 1.17rem; } diff --git a/client/src/components/landing/landing.css b/client/src/components/landing/landing.css index d5d677ecacd..8b5ac798f78 100644 --- a/client/src/components/landing/landing.css +++ b/client/src/components/landing/landing.css @@ -26,9 +26,8 @@ } .landing-page h1, -.landing-page h2, -.landing-page p { - font-family: 'Lato', sans-serif; +.landing-page h2 { + font-family: var(--font-family-sans-serif); } figcaption.caption { @@ -120,7 +119,6 @@ figcaption.caption { .testimonials p, .testimonials strong { - font-family: 'Lato', sans-serif; font-size: 1.1rem; margin: 0; color: var(--quaternary-color); diff --git a/client/src/components/layouts/global.css b/client/src/components/layouts/global.css index 9c4fbea5543..4e10587b54a 100644 --- a/client/src/components/layouts/global.css +++ b/client/src/components/layouts/global.css @@ -6,7 +6,7 @@ html { body { height: 100%; - font-family: 'Hack-ZeroSlash', monospace; + font-family: var(--font-family-sans-serif); color: var(--secondary-color); background: var(--secondary-background); } @@ -77,24 +77,30 @@ h1 { color: var(--secondary-color); font-weight: 700; font-size: 1.5rem; - font-family: 'Hack-ZeroSlash', monospace; + font-family: var(--font-family-monospace); margin: 0.6rem 0; } h2 { color: var(--secondary-color); font-weight: 700; font-size: 1.25rem; - font-family: 'Hack-ZeroSlash', monospace; + font-family: var(--font-family-monospace); margin: 0.6rem 0; } h3 { color: var(--secondary-color); font-weight: 700; font-size: 1.1rem; - font-family: 'Hack-ZeroSlash', monospace; + font-family: var(--font-family-monospace); margin: 0 0 0.6rem; } +h4, +h5, +h6 { + font-family: var(--font-family-monospace); +} + h4, h5, h6, @@ -104,7 +110,6 @@ th { color: var(--secondary-color); font-weight: 400; font-size: 1rem; - font-family: 'Hack-ZeroSlash', monospace; margin: 0 0 1.2rem; } @@ -433,7 +438,7 @@ code { background-color: var(--quaternary-background); color: var(--tertiary-color); border-radius: 0; - font-family: 'Hack-ZeroSlash', monospace; + font-family: var(--font-family-monospace); overflow-wrap: anywhere; } diff --git a/client/src/components/layouts/variables.css b/client/src/components/layouts/variables.css index 33c5e9967e0..59ba5ac42e8 100644 --- a/client/src/components/layouts/variables.css +++ b/client/src/components/layouts/variables.css @@ -28,6 +28,8 @@ --love-dark: #f82153; --editor-background-light: #fffffe; --editor-background-dark: #2a2b40; + --font-family-sans-serif: 'Lato', sans-serif; + --font-family-monospace: 'Hack-ZeroSlash', monospace; } .dark-palette { diff --git a/client/src/components/search/searchBar/searchbar.css b/client/src/components/search/searchBar/searchbar.css index f4ac394d740..727cb851623 100644 --- a/client/src/components/search/searchBar/searchbar.css +++ b/client/src/components/search/searchBar/searchbar.css @@ -1,7 +1,6 @@ .fcc_searchBar { flex-grow: 1; max-height: 33px; - font-family: 'Lato', sans-serif; } .fcc_searchBar strong, diff --git a/client/src/components/settings/honesty.css b/client/src/components/settings/honesty.css index dd0d550b49f..57a4758dd6b 100644 --- a/client/src/components/settings/honesty.css +++ b/client/src/components/settings/honesty.css @@ -1,6 +1,5 @@ .honesty-panel p { margin-inline: 10px; - font-family: 'Lato', sans-serif; } .honesty-panel { diff --git a/client/src/pages/blocked.css b/client/src/pages/blocked.css deleted file mode 100644 index 7c9dcf04a6b..00000000000 --- a/client/src/pages/blocked.css +++ /dev/null @@ -1,3 +0,0 @@ -.blocked-body p { - font-family: Lato, sans-serif; -} diff --git a/client/src/pages/blocked.tsx b/client/src/pages/blocked.tsx index f4fd37ccaf7..090eff366a2 100644 --- a/client/src/pages/blocked.tsx +++ b/client/src/pages/blocked.tsx @@ -3,7 +3,6 @@ import { Grid, Col, Row } from '@freecodecamp/react-bootstrap'; import Helmet from 'react-helmet'; import { Spacer } from '../components/helpers'; -import './blocked.css'; function BlockedPage(): JSX.Element { return ( diff --git a/client/src/pages/certification.css b/client/src/pages/certification.css index 301dd214383..d425dafe4df 100644 --- a/client/src/pages/certification.css +++ b/client/src/pages/certification.css @@ -1,9 +1,3 @@ -@font-face { - font-family: 'Sax Mono'; - src: url('/fonts/saxmono.ttf') format('truetype'); - font-display: fallback; -} - .certification-namespace * { margin: 0; padding: 0; @@ -30,10 +24,6 @@ padding: 0; } -.certification-namespace.certificate-wrapper { - font-family: 'Sax Mono', monospace; -} - /* center the certificate vertically */ .certificate-outer-wrapper { display: flex; @@ -65,11 +55,6 @@ color: var(--quaternary-color); } -.certificate-outer-wrapper .donation-section, -.certificate-outer-wrapper .donation-section p { - font-family: 'Lato', sans-serif; -} - .certification-namespace header { width: 100%; height: 140px; diff --git a/client/src/pages/email-sign-up.css b/client/src/pages/email-sign-up.css index 23bdc8e2ad1..16a84c7e6f1 100644 --- a/client/src/pages/email-sign-up.css +++ b/client/src/pages/email-sign-up.css @@ -1,6 +1,5 @@ .email-sign-up strong, .email-sign-up p { - font-family: 'Lato', sans-serif; font-size: 1rem; } diff --git a/client/src/templates/Challenges/classic/editor.css b/client/src/templates/Challenges/classic/editor.css index b5239951b49..09f41a455e8 100644 --- a/client/src/templates/Challenges/classic/editor.css +++ b/client/src/templates/Challenges/classic/editor.css @@ -59,7 +59,6 @@ textarea.inputarea { .description-container h1 { color: var(--secondary-color); - font-family: Hack-ZeroSlash, monospace; font-size: 1.1rem; font-weight: 700; line-height: 1.1; @@ -119,7 +118,6 @@ textarea.inputarea { .test-feedback p { margin: 0.45rem 0 0; - font-family: 'Lato', sans-serif; } .test-feedback h2 { diff --git a/client/src/templates/Challenges/codeally/codeally.css b/client/src/templates/Challenges/codeally/codeally.css index 37cebb6822b..267b81b54da 100644 --- a/client/src/templates/Challenges/codeally/codeally.css +++ b/client/src/templates/Challenges/codeally/codeally.css @@ -1,7 +1,3 @@ -.ca-description { - font-family: 'Lato', sans-serif; -} - button[aria-described-by='codeally-cookie-warning'] { font-size: 1.1rem; } diff --git a/client/src/templates/Challenges/components/challenge-description.css b/client/src/templates/Challenges/components/challenge-description.css index c9bf3c735fc..fd18c5dcf6f 100644 --- a/client/src/templates/Challenges/components/challenge-description.css +++ b/client/src/templates/Challenges/components/challenge-description.css @@ -7,15 +7,3 @@ margin-bottom: 1.45rem; font-size: 0.9rem; } - -#description p, -#instructions p, -#notes p, -#description ul, -#instructions ul, -#notes ul, -#description ol, -#instructions ol, -#notes ol { - font-family: 'Lato', sans-serif; -} diff --git a/client/src/templates/Introduction/intro.css b/client/src/templates/Introduction/intro.css index 615557a8960..f48bbe4f528 100644 --- a/client/src/templates/Introduction/intro.css +++ b/client/src/templates/Introduction/intro.css @@ -1,10 +1,8 @@ .super-block-intro-page p { - font-family: 'Lato', sans-serif; font-size: 1.17rem; } .super-block-intro-page .alert p { - font-family: inherit; font-size: inherit; } @@ -358,11 +356,6 @@ button.map-title { margin-top: 1.45rem; } -.intro-layout p, -.intro-layout li { - font-family: 'Lato', sans-serif; -} - .intro-toc .list-group-item { margin: 5px auto; } @@ -429,7 +422,7 @@ button.map-title { padding: 25px; } -/* this margin is used to center the element. +/* this margin is used to center the element. ToDo: find out why, and remove the need for it */ .block-grid .map-title > svg { margin-bottom: 4px; @@ -451,6 +444,7 @@ ToDo: find out why, and remove the need for it */ .block-grid .progress-wrapper { width: 100%; text-align: left; + font-family: var(--font-family-sans-serif); display: flex; align-items: center; margin-top: 18px; diff --git a/tools/challenge-editor/client/src/index.css b/tools/challenge-editor/client/src/index.css index 85269430b03..206d03c1a40 100644 --- a/tools/challenge-editor/client/src/index.css +++ b/tools/challenge-editor/client/src/index.css @@ -3,6 +3,8 @@ --background: #1b1b32; --content: #f5f6f7; --grey: #3b3b4f; + --font-family-sans-serif: 'Lato', sans-serif; + --font-family-monospace: 'Hack-ZeroSlash', monospace; } @font-face { @@ -13,7 +15,7 @@ body { margin: 0; padding: 0; - font-family: 'Lato'; + font-family: var(--font-family-sans-serif); text-align: center; background: var(--background); color: var(--content);