diff --git a/CHANGELOG.md b/CHANGELOG.md index a76901e1..7d74daa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ ### New Features - Field validation success is added to form validation ([#265](https://github.com/18F/identity-style-guide/pull/265)) + ### Improvements +- The default font is now Public Sans for both headings and body copy. This is not being considered a breaking change, as it is the new default guidance. To preserve existing font settings to allow more time to migrate, set `$theme-font-type-sans: 'source-sans-pro';` and `$theme-font-type-serif: 'merriweather';`. ([#264](https://github.com/18F/identity-style-guide/pull/264)) - Add Login.gov-specific component configuration. ([#258])(https://github.com/18F/identity-style-guide/pull/258)) - [Identifier component](https://designsystem.digital.gov/components/identifier/) - Link colors on dark backgrounds diff --git a/docs/_utilities/typography.md b/docs/_utilities/typography.md index 3cba79c3..15c1f490 100644 --- a/docs/_utilities/typography.md +++ b/docs/_utilities/typography.md @@ -8,7 +8,7 @@ redirect_from: ## Display, headings, and lead -Use div.usa-prose to indicate that the immediately containing headings and paragraphs should be considered a longform text document. Or jump to the [Print Guidance](#print-guidance) to learn a bit more about each style. +Use div.usa-prose to indicate that the immediately containing headings and paragraphs should be considered a longform text document.
How Login.gov keeps personal information private (div.usa-display)
@@ -47,14 +47,3 @@ Use div.usa-prose to indicate that the immedia
  • Dedicated teams of design and security experts will continuously improve it.
  • - -# Print Guidance - -# Merriweather Web 39px - line height 54px (h1) -## Merriweather Web 21px - line height 30px (h2) -### Merriweather Web 16.5px - line height 23px (h3) -#### Merriweather Web 14.6px - line height 20px(h4) -##### Source Sans Pro Web - All Caps 12.6px - line height 17.5px(h5) -
    Source Sans Pro Web - All Caps 10.6px - line height 13.5px (h6)
    - -Source Sans Prob Web 16px - line height 24.3px(p) diff --git a/src/scss/uswds-theme/_typography.scss b/src/scss/uswds-theme/_typography.scss index 584b0033..0b7d2990 100644 --- a/src/scss/uswds-theme/_typography.scss +++ b/src/scss/uswds-theme/_typography.scss @@ -59,6 +59,34 @@ Relative font file path $theme-font-path: if(variable-exists(font-path), $font-path, '../fonts') !default; +/* +---------------------------------------- +Type-based font settings +---------------------------------------- +Set the type-based tokens for your +project from the following tokens, +or from any new font tokens you added in +$theme-typeface-tokens. +---------------------------------------- +'georgia' +'helvetica' +'merriweather' +'open-sans' +'public-sans' +'roboto-mono' +'source-sans-pro' +'system' +'tahoma' +'verdana' +---------------------------------------- +*/ + +// sans-serif +$theme-font-type-sans: 'public-sans'; + +// serif +$theme-font-type-serif: 'public-sans'; + /* ---------------------------------------- Type scale