From 8283814cdb6384a54ae94973d9b60a886817f7d9 Mon Sep 17 00:00:00 2001 From: Minghua Sun Date: Tue, 12 May 2020 11:07:27 -0400 Subject: [PATCH] [assets] font weights as variables (#1054) * switch to use variables * revert paths * fix * add changelog * fix var * add lightest var * add lightest var --- assets/scss/00-base/_pikaday.scss | 4 +- assets/scss/00-base/_variables.scss | 9 ++ assets/scss/00-base/mixins/_ma-button.scss | 2 +- .../mixins/_ma-truncated-body-text.scss | 2 +- .../scss/00-base/mixins/_ma-typography.scss | 10 +-- assets/scss/01-atoms/_address.scss | 2 +- assets/scss/01-atoms/_button-search.scss | 2 +- assets/scss/01-atoms/_button-sort.scss | 2 +- assets/scss/01-atoms/_button-tag.scss | 2 +- assets/scss/01-atoms/_button-toggle.scss | 2 +- assets/scss/01-atoms/_button-with-icon.scss | 4 +- assets/scss/01-atoms/_buttons.scss | 2 +- assets/scss/01-atoms/_decorative-link.scss | 2 +- assets/scss/01-atoms/_email.scss | 2 +- assets/scss/01-atoms/_error-msg.scss | 2 +- assets/scss/01-atoms/_event-time.scss | 2 +- assets/scss/01-atoms/_figure.scss | 2 +- .../scss/01-atoms/_fixed-feedback-button.scss | 2 +- assets/scss/01-atoms/_footnote-link.scss | 2 +- assets/scss/01-atoms/_footnote.scss | 4 +- assets/scss/01-atoms/_forms.scss | 10 +-- assets/scss/01-atoms/_input-checkbox.scss | 2 +- assets/scss/01-atoms/_input-fuzzy.scss | 2 +- assets/scss/01-atoms/_input-group.scss | 2 +- assets/scss/01-atoms/_input-radio.scss | 4 +- assets/scss/01-atoms/_phone-number.scss | 2 +- assets/scss/01-atoms/_publish-state.scss | 2 +- assets/scss/01-atoms/_select-box.scss | 4 +- assets/scss/01-atoms/_site-logo.scss | 2 +- assets/scss/01-atoms/_table.scss | 4 +- assets/scss/01-atoms/_textarea.scss | 2 +- assets/scss/01-atoms/_unordered-list.scss | 2 +- assets/scss/01-atoms/global/_elements.scss | 8 +- assets/scss/02-molecules/_accordion-item.scss | 4 +- assets/scss/02-molecules/_action-event.scss | 2 +- assets/scss/02-molecules/_action-image.scss | 2 +- assets/scss/02-molecules/_action-step.scss | 2 +- assets/scss/02-molecules/_arrow-nav.scss | 2 +- assets/scss/02-molecules/_breadcrumb.scss | 4 +- assets/scss/02-molecules/_button-alert.scss | 2 +- assets/scss/02-molecules/_callout-link.scss | 6 +- assets/scss/02-molecules/_card.scss | 2 +- .../02-molecules/_collapsible-header.scss | 2 +- assets/scss/02-molecules/_contact-group.scss | 8 +- assets/scss/02-molecules/_contact-us.scss | 2 +- assets/scss/02-molecules/_date-range.scss | 2 +- assets/scss/02-molecules/_download-link.scss | 2 +- .../scss/02-molecules/_emergency-alert.scss | 2 +- .../scss/02-molecules/_emergency-header.scss | 4 +- assets/scss/02-molecules/_error-list.scss | 4 +- assets/scss/02-molecules/_event-teaser.scss | 8 +- assets/scss/02-molecules/_footer-links.scss | 2 +- assets/scss/02-molecules/_general-teaser.scss | 4 +- assets/scss/02-molecules/_header-contact.scss | 2 +- assets/scss/02-molecules/_header-tags.scss | 4 +- assets/scss/02-molecules/_image-promo.scss | 2 +- assets/scss/02-molecules/_info-window.scss | 2 +- assets/scss/02-molecules/_keyword-search.scss | 2 +- assets/scss/02-molecules/_labelled-list.scss | 2 +- assets/scss/02-molecules/_listing-table.scss | 2 +- assets/scss/02-molecules/_location-icons.scss | 2 +- assets/scss/02-molecules/_main-nav.scss | 8 +- assets/scss/02-molecules/_org-info.scss | 2 +- assets/scss/02-molecules/_page-intro.scss | 2 +- assets/scss/02-molecules/_pagination.scss | 2 +- assets/scss/02-molecules/_press-status.scss | 4 +- assets/scss/02-molecules/_press-teaser.scss | 4 +- .../scss/02-molecules/_results-heading.scss | 2 +- assets/scss/02-molecules/_sticky-nav.scss | 4 +- assets/scss/02-molecules/_tabs.scss | 2 +- assets/scss/02-molecules/_tags.scss | 2 +- assets/scss/02-molecules/_tooltip-popup.scss | 2 +- assets/scss/02-molecules/_tooltip.scss | 2 +- assets/scss/02-molecules/_wait-time.scss | 4 +- assets/scss/03-organisms/_about-section.scss | 2 +- assets/scss/03-organisms/_action-card.scss | 2 +- assets/scss/03-organisms/_action-details.scss | 6 +- assets/scss/03-organisms/_action-finder.scss | 2 +- assets/scss/03-organisms/_breadcrumbs.scss | 2 +- .../scss/03-organisms/_callout-message.scss | 2 +- assets/scss/03-organisms/_callout-time.scss | 2 +- assets/scss/03-organisms/_callout.scss | 2 +- assets/scss/03-organisms/_collage-header.scss | 6 +- assets/scss/03-organisms/_contact-row.scss | 2 +- assets/scss/03-organisms/_error-page.scss | 6 +- assets/scss/03-organisms/_event-listing.scss | 2 +- .../03-organisms/_featured-item-mosaic.scss | 2 +- assets/scss/03-organisms/_footer-slim.scss | 4 +- assets/scss/03-organisms/_footer.scss | 4 +- assets/scss/03-organisms/_gen-teaser.scss | 4 +- assets/scss/03-organisms/_header-alert.scss | 4 +- assets/scss/03-organisms/_header-slim.scss | 4 +- assets/scss/03-organisms/_header.scss | 6 +- .../03-organisms/_illustrated-header.scss | 4 +- assets/scss/03-organisms/_image-credit.scss | 2 +- .../scss/03-organisms/_image-link-list.scss | 2 +- assets/scss/03-organisms/_in-page-alert.scss | 2 +- assets/scss/03-organisms/_jump-links.scss | 6 +- assets/scss/03-organisms/_key-message.scss | 2 +- assets/scss/03-organisms/_link-list.scss | 2 +- .../scss/03-organisms/_location-listing.scss | 6 +- .../03-organisms/_mass-feedback-form.scss | 2 +- .../_organization-navigation-item.scss | 12 +-- .../_organization-navigation.scss | 8 +- assets/scss/03-organisms/_page-banner.scss | 10 +-- assets/scss/03-organisms/_page-header.scss | 4 +- assets/scss/03-organisms/_person-card.scss | 4 +- assets/scss/03-organisms/_press-filters.scss | 2 +- assets/scss/03-organisms/_pullquote.scss | 2 +- .../_related-orgs-and-topics.scss | 2 +- assets/scss/03-organisms/_rich-text.scss | 2 +- assets/scss/03-organisms/_search-banner.scss | 26 +++--- assets/scss/03-organisms/_steps-ordered.scss | 2 +- assets/scss/03-organisms/_sticky-toc.scss | 18 ++-- assets/scss/03-organisms/_tab-container.scss | 2 +- .../03-organisms/_teaser-listing-group.scss | 2 +- assets/scss/03-organisms/_teaser-listing.scss | 2 +- assets/scss/03-organisms/_teaser.scss | 8 +- .../scss/03-organisms/_transition-page.scss | 2 +- assets/scss/03-organisms/_utility-nav.scss | 12 +-- assets/scss/03-organisms/_utility-panel.scss | 4 +- changelogs/{template.yml => DP-18591.yml} | 0 react/package-lock.json | 85 +++++-------------- 123 files changed, 251 insertions(+), 281 deletions(-) rename changelogs/{template.yml => DP-18591.yml} (100%) diff --git a/assets/scss/00-base/_pikaday.scss b/assets/scss/00-base/_pikaday.scss index 1fcb1c1e85..a05ef4ec6c 100644 --- a/assets/scss/00-base/_pikaday.scss +++ b/assets/scss/00-base/_pikaday.scss @@ -25,12 +25,12 @@ background-color: $c-bg-section; color: $c-font-base; font-size: 13px; - font-weight: 500; + font-weight: $fonts-normal; text-align: center; .is-today & { color: $c-primary; - font-weight: 800; + font-weight: $fonts-bolder; &:hover { color: $c-font-inverse; diff --git a/assets/scss/00-base/_variables.scss b/assets/scss/00-base/_variables.scss index 0b0499bd29..756b635c05 100644 --- a/assets/scss/00-base/_variables.scss +++ b/assets/scss/00-base/_variables.scss @@ -38,3 +38,12 @@ $close-icon: '\00d7'; $fonts: "Texta", "Helvetica", "Arial", sans-serif; $fonts-mono: "Source Code Pro", "Monaco", monospace; $fonts-khmer: "Hanuman"; + + +// font weights +$fonts-lightest: 100; // use only to style non text font weights, e.g. separator | +$fonts-lighter: 300; +$fonts-light: 400; +$fonts-normal: 500; +$fonts-bold: 700; +$fonts-bolder: 800; diff --git a/assets/scss/00-base/mixins/_ma-button.scss b/assets/scss/00-base/mixins/_ma-button.scss index 008767e968..cc141ff286 100644 --- a/assets/scss/00-base/mixins/_ma-button.scss +++ b/assets/scss/00-base/mixins/_ma-button.scss @@ -33,7 +33,7 @@ } // theme @else { - font-weight: 700; + font-weight: $fonts-bold; @if ($type == "solid") { background-color: $color; diff --git a/assets/scss/00-base/mixins/_ma-truncated-body-text.scss b/assets/scss/00-base/mixins/_ma-truncated-body-text.scss index e6c2642688..78d79ef222 100644 --- a/assets/scss/00-base/mixins/_ma-truncated-body-text.scss +++ b/assets/scss/00-base/mixins/_ma-truncated-body-text.scss @@ -53,7 +53,7 @@ height: 60px; background: transparent; border: 0; - font-weight: 700; + font-weight: $fonts-bold; color: $c-primary; &::after { diff --git a/assets/scss/00-base/mixins/_ma-typography.scss b/assets/scss/00-base/mixins/_ma-typography.scss index 0b78abeda5..712a5cabbc 100644 --- a/assets/scss/00-base/mixins/_ma-typography.scss +++ b/assets/scss/00-base/mixins/_ma-typography.scss @@ -90,7 +90,7 @@ @mixin ma-texta-style($weight: 'Light', $italic: false) { @if ($weight == 'Light') { - font-weight: 300; + font-weight: $fonts-lighter; @if ($italic == true) { font-style: italic; @@ -98,7 +98,7 @@ } @if ($weight == 'Book') { - font-weight: 400; + font-weight: $fonts-light; @if ($italic == true) { font-style: italic; @@ -106,7 +106,7 @@ } @if ($weight == 'Medium') { - font-weight: 500; + font-weight: $fonts-normal; @if ($italic == true) { font-style: italic; @@ -114,7 +114,7 @@ } @if ($weight == 'Bold') { - font-weight: 700; + font-weight: $fonts-bold; @if ($italic == true) { font-style: italic; @@ -122,7 +122,7 @@ } @if ($weight == 'Black') { - font-weight: 800; + font-weight: $fonts-bolder; @if ($italic == true) { font-style: italic; diff --git a/assets/scss/01-atoms/_address.scss b/assets/scss/01-atoms/_address.scss index 35d0f78e69..ca26a88bef 100644 --- a/assets/scss/01-atoms/_address.scss +++ b/assets/scss/01-atoms/_address.scss @@ -1,7 +1,7 @@ .ma__address { &__address { - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/01-atoms/_button-search.scss b/assets/scss/01-atoms/_button-search.scss index 9c23a1d201..5b97b26987 100644 --- a/assets/scss/01-atoms/_button-search.scss +++ b/assets/scss/01-atoms/_button-search.scss @@ -30,7 +30,7 @@ } color: $color; font-size: 14px; - font-weight: 700; + font-weight: $fonts-bold; &:hover, &:focus { diff --git a/assets/scss/01-atoms/_button-sort.scss b/assets/scss/01-atoms/_button-sort.scss index 9e3254043e..2be7a25749 100644 --- a/assets/scss/01-atoms/_button-sort.scss +++ b/assets/scss/01-atoms/_button-sort.scss @@ -35,7 +35,7 @@ .ma__button-sort { color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; &--asc, &--dsc { diff --git a/assets/scss/01-atoms/_button-tag.scss b/assets/scss/01-atoms/_button-tag.scss index 192fa58fbc..f967eab0a2 100644 --- a/assets/scss/01-atoms/_button-tag.scss +++ b/assets/scss/01-atoms/_button-tag.scss @@ -9,7 +9,7 @@ white-space: nowrap; background-color: tint($c-font-link,90%); color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; &:after { content: "+"; diff --git a/assets/scss/01-atoms/_button-toggle.scss b/assets/scss/01-atoms/_button-toggle.scss index a441d677bf..b6ffaf9796 100644 --- a/assets/scss/01-atoms/_button-toggle.scss +++ b/assets/scss/01-atoms/_button-toggle.scss @@ -16,7 +16,7 @@ &--selected { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; pointer-events: none; } } diff --git a/assets/scss/01-atoms/_button-with-icon.scss b/assets/scss/01-atoms/_button-with-icon.scss index 06856951c5..0f38fef5a3 100644 --- a/assets/scss/01-atoms/_button-with-icon.scss +++ b/assets/scss/01-atoms/_button-with-icon.scss @@ -17,7 +17,7 @@ $quaternary-colors: ( background-color: $c-white; border: 2px solid $c-gray-light; display: inline-block; - font-weight: 700; + font-weight: $fonts-bold; letter-spacing: $letter-spacing-large; padding: 10px 14px; text-transform: uppercase; @@ -200,7 +200,7 @@ $quaternary-colors: ( &--alert { font-size: 16px; - font-weight: 700; + font-weight: $fonts-bold; letter-spacing: $letter-spacing-large; line-height: 1; padding: .4em; diff --git a/assets/scss/01-atoms/_buttons.scss b/assets/scss/01-atoms/_buttons.scss index 97490ab95a..eeb657a921 100644 --- a/assets/scss/01-atoms/_buttons.scss +++ b/assets/scss/01-atoms/_buttons.scss @@ -9,7 +9,7 @@ $primarycolors: ( button { cursor: pointer; font-family: $fonts; - font-weight: 400; + font-weight: $fonts-light; } .ma__button { diff --git a/assets/scss/01-atoms/_decorative-link.scss b/assets/scss/01-atoms/_decorative-link.scss index 44bc1df867..28a8d42c7b 100644 --- a/assets/scss/01-atoms/_decorative-link.scss +++ b/assets/scss/01-atoms/_decorative-link.scss @@ -40,7 +40,7 @@ } &__details { - font-weight: 400; + font-weight: $fonts-light; } a { diff --git a/assets/scss/01-atoms/_email.scss b/assets/scss/01-atoms/_email.scss index 90bef098af..55ea30937f 100644 --- a/assets/scss/01-atoms/_email.scss +++ b/assets/scss/01-atoms/_email.scss @@ -1,7 +1,7 @@ .ma__email { &__email { - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-detail; } diff --git a/assets/scss/01-atoms/_error-msg.scss b/assets/scss/01-atoms/_error-msg.scss index 51c4c235a1..75c8ab2210 100644 --- a/assets/scss/01-atoms/_error-msg.scss +++ b/assets/scss/01-atoms/_error-msg.scss @@ -6,7 +6,7 @@ font-size: 1.125rem; line-height: 1.2rem; margin: .3em 0; - font-weight: 500; + font-weight: $fonts-normal; svg { flex: 0 0 1.2rem; diff --git a/assets/scss/01-atoms/_event-time.scss b/assets/scss/01-atoms/_event-time.scss index d02a200e1c..0e9b9e89ad 100644 --- a/assets/scss/01-atoms/_event-time.scss +++ b/assets/scss/01-atoms/_event-time.scss @@ -1,7 +1,7 @@ .ma__event-time { &__calendar, { - font-weight: 700; + font-weight: $fonts-bold; line-height: 1.3; } diff --git a/assets/scss/01-atoms/_figure.scss b/assets/scss/01-atoms/_figure.scss index 5b15b128e1..79ffafd807 100644 --- a/assets/scss/01-atoms/_figure.scss +++ b/assets/scss/01-atoms/_figure.scss @@ -262,6 +262,6 @@ .ma__figure { &__caption { - font-weight: 300; + font-weight: $fonts-lighter; } } diff --git a/assets/scss/01-atoms/_fixed-feedback-button.scss b/assets/scss/01-atoms/_fixed-feedback-button.scss index b4f72e6bb0..93b8d1bfc9 100644 --- a/assets/scss/01-atoms/_fixed-feedback-button.scss +++ b/assets/scss/01-atoms/_fixed-feedback-button.scss @@ -17,7 +17,7 @@ color: $c-primary-alt; display: block; font-size: 1.5rem; - font-weight: 500; + font-weight: $fonts-normal; left: -40px; letter-spacing: 0.15rem; padding: 0 10px; diff --git a/assets/scss/01-atoms/_footnote-link.scss b/assets/scss/01-atoms/_footnote-link.scss index e287a0f542..b71d722551 100644 --- a/assets/scss/01-atoms/_footnote-link.scss +++ b/assets/scss/01-atoms/_footnote-link.scss @@ -6,6 +6,6 @@ display: inline-flex; color: $c-font-link; font-size: 1.25rem; - font-weight: 700; + font-weight: $fonts-bold; line-height: 1; } \ No newline at end of file diff --git a/assets/scss/01-atoms/_footnote.scss b/assets/scss/01-atoms/_footnote.scss index 026d8ca65e..3c92af2c6c 100644 --- a/assets/scss/01-atoms/_footnote.scss +++ b/assets/scss/01-atoms/_footnote.scss @@ -13,12 +13,12 @@ span { margin-bottom: 0px; cursor: pointer; - font-weight: 400; + font-weight: $fonts-light; font-size: 1.25rem; color: $c-font-link; a { - font-weight: 500; + font-weight: $fonts-normal; border-bottom: 1px solid; } diff --git a/assets/scss/01-atoms/_forms.scss b/assets/scss/01-atoms/_forms.scss index f879a9c5f0..b9183e3b88 100644 --- a/assets/scss/01-atoms/_forms.scss +++ b/assets/scss/01-atoms/_forms.scss @@ -21,7 +21,7 @@ input { border: 2px solid $c-bd-input; color: $c-font-base; font-size: 1.375rem; - font-weight: 400; + font-weight: $fonts-light; max-width: 100%; min-height: 40px; padding: 0 18px; @@ -38,7 +38,7 @@ optgroup, select, textarea { font-family: $fonts; - font-weight: 400; + font-weight: $fonts-light; font-size: 1.375rem; } @@ -68,7 +68,7 @@ textarea { background-color: $c-white; border: 2px solid $c-bd-input; font-size: 1.375rem; - font-weight: 400; + font-weight: $fonts-light; max-width: 100%; min-height: 135px; padding: 18px; @@ -93,7 +93,7 @@ label { display: block; margin-bottom: .25em; padding: 0; - font-weight: 500; + font-weight: $fonts-normal; } @@ -105,7 +105,7 @@ fieldset { optgroup, select { - font-weight: 400; + font-weight: $fonts-light; font-size: 1.375rem; max-width: 100%; } diff --git a/assets/scss/01-atoms/_input-checkbox.scss b/assets/scss/01-atoms/_input-checkbox.scss index 0e38b915ef..f7280dcd36 100644 --- a/assets/scss/01-atoms/_input-checkbox.scss +++ b/assets/scss/01-atoms/_input-checkbox.scss @@ -79,7 +79,7 @@ } label { - font-weight: 400; + font-weight: $fonts-light; &:before { background-color: $c-white; diff --git a/assets/scss/01-atoms/_input-fuzzy.scss b/assets/scss/01-atoms/_input-fuzzy.scss index ac06063029..8a0788bf0b 100644 --- a/assets/scss/01-atoms/_input-fuzzy.scss +++ b/assets/scss/01-atoms/_input-fuzzy.scss @@ -5,7 +5,7 @@ .react-autowhatever__input { height: 30px; padding: 10px 20px; - font-weight: 400; + font-weight: $fonts-light; font-size: 1.375rem; border: 2px solid $c-gray-light; -webkit-appearance: none; diff --git a/assets/scss/01-atoms/_input-group.scss b/assets/scss/01-atoms/_input-group.scss index 6699aace47..7e21f9faf4 100644 --- a/assets/scss/01-atoms/_input-group.scss +++ b/assets/scss/01-atoms/_input-group.scss @@ -32,6 +32,6 @@ .ma__input-group { &__title { - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/01-atoms/_input-radio.scss b/assets/scss/01-atoms/_input-radio.scss index 859e876f82..359a9b2e68 100644 --- a/assets/scss/01-atoms/_input-radio.scss +++ b/assets/scss/01-atoms/_input-radio.scss @@ -13,7 +13,7 @@ font-size: 1.375rem; line-height: 1rem; padding-left: 1.5em; - font-weight: 400; + font-weight: $fonts-light; &:before { border: 2px solid; @@ -144,7 +144,7 @@ $control-height: 1.2rem; height: 100%; border-radius: $border-radius * 8; z-index: -1; // so that background is behind everything - font-weight: 700; //fixed + font-weight: $fonts-bold; //fixed transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out; border: 1px solid } diff --git a/assets/scss/01-atoms/_phone-number.scss b/assets/scss/01-atoms/_phone-number.scss index b57c33a82b..c3781c8c5e 100644 --- a/assets/scss/01-atoms/_phone-number.scss +++ b/assets/scss/01-atoms/_phone-number.scss @@ -1,7 +1,7 @@ .ma__phone-number { &__number { - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-detail; } } \ No newline at end of file diff --git a/assets/scss/01-atoms/_publish-state.scss b/assets/scss/01-atoms/_publish-state.scss index 0be7b21194..32ada7caa7 100644 --- a/assets/scss/01-atoms/_publish-state.scss +++ b/assets/scss/01-atoms/_publish-state.scss @@ -29,5 +29,5 @@ .ma__publish-state { color: $c-font-medium; - font-weight: 700; + font-weight: $fonts-bold; } diff --git a/assets/scss/01-atoms/_select-box.scss b/assets/scss/01-atoms/_select-box.scss index ef54be748a..cbb4ee1b14 100644 --- a/assets/scss/01-atoms/_select-box.scss +++ b/assets/scss/01-atoms/_select-box.scss @@ -83,12 +83,12 @@ .ma__select-box { &__label { - font-weight: 500; + font-weight: $fonts-normal; } &__select { color: $c-font-base; - font-weight: 300; + font-weight: $fonts-lighter; } &__link { diff --git a/assets/scss/01-atoms/_site-logo.scss b/assets/scss/01-atoms/_site-logo.scss index 5b0e16a5d4..1c13060c00 100644 --- a/assets/scss/01-atoms/_site-logo.scss +++ b/assets/scss/01-atoms/_site-logo.scss @@ -46,7 +46,7 @@ a { span { - font-weight: 400; + font-weight: $fonts-light; color: $c-primary-alt; -webkit-text-stroke-width: 1px; diff --git a/assets/scss/01-atoms/_table.scss b/assets/scss/01-atoms/_table.scss index 98b1eab4ca..86a2bebab6 100644 --- a/assets/scss/01-atoms/_table.scss +++ b/assets/scss/01-atoms/_table.scss @@ -69,7 +69,7 @@ &:before { color: $c-font-heading; - font-weight: 500; + font-weight: $fonts-normal; } } @@ -125,7 +125,7 @@ &:before { color: $c-font-heading; - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/01-atoms/_textarea.scss b/assets/scss/01-atoms/_textarea.scss index a4b6b4b859..b3661c6702 100644 --- a/assets/scss/01-atoms/_textarea.scss +++ b/assets/scss/01-atoms/_textarea.scss @@ -24,7 +24,7 @@ .ma__textarea { &__wrapper { - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/01-atoms/_unordered-list.scss b/assets/scss/01-atoms/_unordered-list.scss index c65ce2ee36..b63971bc6e 100644 --- a/assets/scss/01-atoms/_unordered-list.scss +++ b/assets/scss/01-atoms/_unordered-list.scss @@ -6,7 +6,7 @@ flex-wrap: wrap; justify-content: center; align-items: center; - font-weight: 700; + font-weight: $fonts-bold; line-height: 1.2; li:nth-child(n) { diff --git a/assets/scss/01-atoms/global/_elements.scss b/assets/scss/01-atoms/global/_elements.scss index 55c1b5d884..6566ec2cb1 100644 --- a/assets/scss/01-atoms/global/_elements.scss +++ b/assets/scss/01-atoms/global/_elements.scss @@ -38,7 +38,7 @@ body { font-size: 1.375rem; line-height: 1.5; color: $c-font-base; - font-weight: 400; + font-weight: $fonts-light; } @@ -47,7 +47,7 @@ a { @include ma-link-transition; text-decoration: none; - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-link; } @@ -126,7 +126,7 @@ ol { h#{$i} { margin-top: 0; color: $c-font-heading; - font-weight: 700; + font-weight: $fonts-bold; @include ma-heading($i); } @@ -161,5 +161,5 @@ div { } b, strong { - font-weight: 700; + font-weight: $fonts-bold; } diff --git a/assets/scss/02-molecules/_accordion-item.scss b/assets/scss/02-molecules/_accordion-item.scss index 8edde2efc5..017e7340df 100644 --- a/assets/scss/02-molecules/_accordion-item.scss +++ b/assets/scss/02-molecules/_accordion-item.scss @@ -128,12 +128,12 @@ &__title { @include ma-h5; - font-weight: 700; + font-weight: $fonts-bold; margin-bottom: 0; min-height: 32px; &--secondary { - font-weight: 500; + font-weight: $fonts-normal; @include ma-h5; margin-bottom: 0; diff --git a/assets/scss/02-molecules/_action-event.scss b/assets/scss/02-molecules/_action-event.scss index bf8b86996a..f35c21d33e 100644 --- a/assets/scss/02-molecules/_action-event.scss +++ b/assets/scss/02-molecules/_action-event.scss @@ -37,6 +37,6 @@ } &__date { - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_action-image.scss b/assets/scss/02-molecules/_action-image.scss index 5f7ea61f53..f8551d02b5 100644 --- a/assets/scss/02-molecules/_action-image.scss +++ b/assets/scss/02-molecules/_action-image.scss @@ -13,6 +13,6 @@ &__title { margin-bottom: 15px; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_action-step.scss b/assets/scss/02-molecules/_action-step.scss index 6ce2280eef..d6bd7d57d3 100644 --- a/assets/scss/02-molecules/_action-step.scss +++ b/assets/scss/02-molecules/_action-step.scss @@ -117,6 +117,6 @@ &__title { @include ma-h4; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_arrow-nav.scss b/assets/scss/02-molecules/_arrow-nav.scss index 34d25f5bea..3c63364e9e 100644 --- a/assets/scss/02-molecules/_arrow-nav.scss +++ b/assets/scss/02-molecules/_arrow-nav.scss @@ -74,7 +74,7 @@ } &__text { - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-link; @media ($bp-small-max) { diff --git a/assets/scss/02-molecules/_breadcrumb.scss b/assets/scss/02-molecules/_breadcrumb.scss index 939c10a09c..d76bfa6743 100644 --- a/assets/scss/02-molecules/_breadcrumb.scss +++ b/assets/scss/02-molecules/_breadcrumb.scss @@ -11,7 +11,7 @@ a { color: $c-black; - font-weight: 700; + font-weight: $fonts-bold; cursor: text; pointer-events: none; } @@ -26,7 +26,7 @@ a { color: $c-gray-dark; - font-weight: 500; + font-weight: $fonts-normal; @include ma-link-transition; diff --git a/assets/scss/02-molecules/_button-alert.scss b/assets/scss/02-molecules/_button-alert.scss index 6dac0ebfd9..e59aec0197 100644 --- a/assets/scss/02-molecules/_button-alert.scss +++ b/assets/scss/02-molecules/_button-alert.scss @@ -4,7 +4,7 @@ @include ma-chevron; font-size: 16px; - font-weight: 700; + font-weight: $fonts-bold; letter-spacing: $letter-spacing-large; line-height: 1; padding: .4em; diff --git a/assets/scss/02-molecules/_callout-link.scss b/assets/scss/02-molecules/_callout-link.scss index df73a56814..ebb93a336b 100644 --- a/assets/scss/02-molecules/_callout-link.scss +++ b/assets/scss/02-molecules/_callout-link.scss @@ -53,7 +53,7 @@ display: none; padding-top: 10px; font-size: 1.25rem; - font-weight: 400; + font-weight: $fonts-light; color: rgba($c-font-link,1); @media ($bp-x-small-min) { @@ -65,7 +65,7 @@ &__eyebrow { background-color: $c-bg-section; - font-weight: 700; + font-weight: $fonts-bold; } &__header { @@ -94,7 +94,7 @@ padding-top: 15px; display: flex; color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; } &--white { diff --git a/assets/scss/02-molecules/_card.scss b/assets/scss/02-molecules/_card.scss index c8fa4336b6..02104fb0ee 100644 --- a/assets/scss/02-molecules/_card.scss +++ b/assets/scss/02-molecules/_card.scss @@ -72,7 +72,7 @@ &__title { text-decoration: none; - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-link; span { diff --git a/assets/scss/02-molecules/_collapsible-header.scss b/assets/scss/02-molecules/_collapsible-header.scss index 834e4749e9..1c04719976 100644 --- a/assets/scss/02-molecules/_collapsible-header.scss +++ b/assets/scss/02-molecules/_collapsible-header.scss @@ -75,6 +75,6 @@ &__title { @include ma-h4; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_contact-group.scss b/assets/scss/02-molecules/_contact-group.scss index 33613b95f4..2eff92ae0b 100644 --- a/assets/scss/02-molecules/_contact-group.scss +++ b/assets/scss/02-molecules/_contact-group.scss @@ -93,19 +93,19 @@ } span { - font-weight: 700; + font-weight: $fonts-bold; } } &__label { - font-weight: 500; + font-weight: $fonts-normal; } &__value { - font-weight: 300; + font-weight: $fonts-lighter; } .ma__content-link--phone { - font-weight: 300; + font-weight: $fonts-lighter; } } diff --git a/assets/scss/02-molecules/_contact-us.scss b/assets/scss/02-molecules/_contact-us.scss index 746dae985c..ed4e756439 100644 --- a/assets/scss/02-molecules/_contact-us.scss +++ b/assets/scss/02-molecules/_contact-us.scss @@ -265,7 +265,7 @@ button { color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; &:after { border-color: $c-font-link; diff --git a/assets/scss/02-molecules/_date-range.scss b/assets/scss/02-molecules/_date-range.scss index 5b644f518c..abf10153d6 100644 --- a/assets/scss/02-molecules/_date-range.scss +++ b/assets/scss/02-molecules/_date-range.scss @@ -37,6 +37,6 @@ .ma__date-range { &__label { - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/02-molecules/_download-link.scss b/assets/scss/02-molecules/_download-link.scss index 607df0ef97..3d96b4e990 100644 --- a/assets/scss/02-molecules/_download-link.scss +++ b/assets/scss/02-molecules/_download-link.scss @@ -81,7 +81,7 @@ } &__file-spec { - font-weight: 500; + font-weight: $fonts-normal; } .ma__form-downloads--listing & { diff --git a/assets/scss/02-molecules/_emergency-alert.scss b/assets/scss/02-molecules/_emergency-alert.scss index df69718af9..509e775ba0 100644 --- a/assets/scss/02-molecules/_emergency-alert.scss +++ b/assets/scss/02-molecules/_emergency-alert.scss @@ -12,7 +12,7 @@ &__time-stamp { font-size: 1.125rem; font-style: italic; - font-weight: 500; + font-weight: $fonts-normal; } &__link { diff --git a/assets/scss/02-molecules/_emergency-header.scss b/assets/scss/02-molecules/_emergency-header.scss index 1b7cf07b61..f46e529cb4 100644 --- a/assets/scss/02-molecules/_emergency-header.scss +++ b/assets/scss/02-molecules/_emergency-header.scss @@ -23,7 +23,7 @@ letter-spacing: $letter-spacing-large; white-space: nowrap; color: rgba($c-font-base,.8); - font-weight: 700; + font-weight: $fonts-bold; @media ($bp-large-max) { margin-bottom: 10px; @@ -68,7 +68,7 @@ font-size: 1.5rem; line-height: 1.4; margin-bottom: 0; - font-weight: 700; + font-weight: $fonts-bold; .ma__decorative-link { display: inline; diff --git a/assets/scss/02-molecules/_error-list.scss b/assets/scss/02-molecules/_error-list.scss index f6b17bc02c..620f2967ef 100644 --- a/assets/scss/02-molecules/_error-list.scss +++ b/assets/scss/02-molecules/_error-list.scss @@ -72,12 +72,12 @@ } &__title { - font-weight: 700; + font-weight: $fonts-bold; } &__label { border-color: $c-bd-error; color: $c-font-error; - font-weight: 400; + font-weight: $fonts-light; } } diff --git a/assets/scss/02-molecules/_event-teaser.scss b/assets/scss/02-molecules/_event-teaser.scss index fab432d064..5521097ec7 100644 --- a/assets/scss/02-molecules/_event-teaser.scss +++ b/assets/scss/02-molecules/_event-teaser.scss @@ -140,22 +140,22 @@ } &__month { - font-weight: 700; + font-weight: $fonts-bold; } &__day { color: $c-primary-alt; - font-weight: 700; + font-weight: $fonts-bold; } &__location, &__time, &__date { - font-weight: 700; + font-weight: $fonts-bold; } &__location { font-style: italic; - font-weight: 500; + font-weight: $fonts-normal; } } \ No newline at end of file diff --git a/assets/scss/02-molecules/_footer-links.scss b/assets/scss/02-molecules/_footer-links.scss index 8d0bef86db..edfc249033 100644 --- a/assets/scss/02-molecules/_footer-links.scss +++ b/assets/scss/02-molecules/_footer-links.scss @@ -57,7 +57,7 @@ &__link { color: $c-font-base; - font-weight: 500; + font-weight: $fonts-normal; &:hover { border-bottom-color: rgba($c-font-dark,.5); diff --git a/assets/scss/02-molecules/_general-teaser.scss b/assets/scss/02-molecules/_general-teaser.scss index f606008b09..0083cd4a1f 100644 --- a/assets/scss/02-molecules/_general-teaser.scss +++ b/assets/scss/02-molecules/_general-teaser.scss @@ -114,12 +114,12 @@ &__eyebrow span { background-color: $c-bg-section; - font-weight: 700; + font-weight: $fonts-bold; } &__emph-text { font-style: italic; - font-weight: 700; + font-weight: $fonts-bold; border-left-color: $c-bd-divider; } } diff --git a/assets/scss/02-molecules/_header-contact.scss b/assets/scss/02-molecules/_header-contact.scss index f6b2626a40..ff5acf0016 100644 --- a/assets/scss/02-molecules/_header-contact.scss +++ b/assets/scss/02-molecules/_header-contact.scss @@ -98,7 +98,7 @@ &__accordion { border-top-color: $c-bd-divider; color: $c-primary; - font-weight: 700; + font-weight: $fonts-bold; &:after { color: $c-primary; diff --git a/assets/scss/02-molecules/_header-tags.scss b/assets/scss/02-molecules/_header-tags.scss index 34cfbeca4e..0e2f9ae0db 100644 --- a/assets/scss/02-molecules/_header-tags.scss +++ b/assets/scss/02-molecules/_header-tags.scss @@ -122,7 +122,7 @@ a { border-color: rgba($c-font-link,.2); - font-weight: 500; + font-weight: $fonts-normal; &:hover { border-color: $c-font-link; @@ -131,7 +131,7 @@ > button { color: $c-primary; - font-weight: 500; + font-weight: $fonts-normal; } } } diff --git a/assets/scss/02-molecules/_image-promo.scss b/assets/scss/02-molecules/_image-promo.scss index 5145865aca..804fe08e53 100644 --- a/assets/scss/02-molecules/_image-promo.scss +++ b/assets/scss/02-molecules/_image-promo.scss @@ -86,7 +86,7 @@ $image-promo-bp-x-large-min: "min-width: 1160px"; align-items: center; color: $c-font-base; display: flex; - font-weight: 400; + font-weight: $fonts-light; } svg { diff --git a/assets/scss/02-molecules/_info-window.scss b/assets/scss/02-molecules/_info-window.scss index 982a5a20fc..c420408747 100644 --- a/assets/scss/02-molecules/_info-window.scss +++ b/assets/scss/02-molecules/_info-window.scss @@ -40,7 +40,7 @@ font-family: $fonts; &__label { - font-weight: 500; + font-weight: $fonts-normal; } &__phone { diff --git a/assets/scss/02-molecules/_keyword-search.scss b/assets/scss/02-molecules/_keyword-search.scss index 8f341dc0bd..8a330e660e 100644 --- a/assets/scss/02-molecules/_keyword-search.scss +++ b/assets/scss/02-molecules/_keyword-search.scss @@ -101,6 +101,6 @@ $header-search-height: 46px; &__reset { color: $c-primary-alt; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_labelled-list.scss b/assets/scss/02-molecules/_labelled-list.scss index 5bf42c9f25..e00aa4db80 100644 --- a/assets/scss/02-molecules/_labelled-list.scss +++ b/assets/scss/02-molecules/_labelled-list.scss @@ -24,6 +24,6 @@ &__label { color: $c-font-detail; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_listing-table.scss b/assets/scss/02-molecules/_listing-table.scss index 5e81f53d19..f2413be6a0 100644 --- a/assets/scss/02-molecules/_listing-table.scss +++ b/assets/scss/02-molecules/_listing-table.scss @@ -178,7 +178,7 @@ > button { color: $c-primary; - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/02-molecules/_location-icons.scss b/assets/scss/02-molecules/_location-icons.scss index 6713498992..d55f9eced7 100644 --- a/assets/scss/02-molecules/_location-icons.scss +++ b/assets/scss/02-molecules/_location-icons.scss @@ -50,6 +50,6 @@ &__name { color: $c-font-medium; - font-weight: 700; + font-weight: $fonts-bold; } } \ No newline at end of file diff --git a/assets/scss/02-molecules/_main-nav.scss b/assets/scss/02-molecules/_main-nav.scss index 4a836fd38c..95f80a2b80 100644 --- a/assets/scss/02-molecules/_main-nav.scss +++ b/assets/scss/02-molecules/_main-nav.scss @@ -310,7 +310,7 @@ } &__top-link { - font-weight: 700; + font-weight: $fonts-bold; .has-subnav & { // chevron @@ -357,7 +357,7 @@ &__link { color: $c-font-base; - font-weight: 500; + font-weight: $fonts-normal; &:hover, &:focus { @@ -367,13 +367,13 @@ &__subitem:first-child &__link { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; } &__subitem:last-child &__link { background-color: $c-bg-subtle; color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; &:hover { background-color: $c-gray-light; diff --git a/assets/scss/02-molecules/_org-info.scss b/assets/scss/02-molecules/_org-info.scss index 7c4ca3f6fa..ce0aca51db 100644 --- a/assets/scss/02-molecules/_org-info.scss +++ b/assets/scss/02-molecules/_org-info.scss @@ -54,6 +54,6 @@ .ma__org-info { &__job-title { - font-weight: 400; + font-weight: $fonts-light; } } diff --git a/assets/scss/02-molecules/_page-intro.scss b/assets/scss/02-molecules/_page-intro.scss index f0242436e9..c01650cf8e 100644 --- a/assets/scss/02-molecules/_page-intro.scss +++ b/assets/scss/02-molecules/_page-intro.scss @@ -17,6 +17,6 @@ &__sub-title { color: $c-font-heading; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_pagination.scss b/assets/scss/02-molecules/_pagination.scss index b9bf89f51d..52e38436ba 100644 --- a/assets/scss/02-molecules/_pagination.scss +++ b/assets/scss/02-molecules/_pagination.scss @@ -29,7 +29,7 @@ padding: 8px 10px; position: relative; color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; @media ($bp-small-min) { diff --git a/assets/scss/02-molecules/_press-status.scss b/assets/scss/02-molecules/_press-status.scss index d8879778f8..8879c352c8 100644 --- a/assets/scss/02-molecules/_press-status.scss +++ b/assets/scss/02-molecules/_press-status.scss @@ -26,7 +26,7 @@ } &__title { - font-weight: 700; + font-weight: $fonts-bold; font-size: 1rem; letter-spacing: $letter-spacing-large; line-height: 1.875rem; @@ -77,6 +77,6 @@ &__title { color: $c-font-detail; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_press-teaser.scss b/assets/scss/02-molecules/_press-teaser.scss index 8c5efade28..e2b159b2f8 100644 --- a/assets/scss/02-molecules/_press-teaser.scss +++ b/assets/scss/02-molecules/_press-teaser.scss @@ -113,13 +113,13 @@ &__eyebrow span { background-color: $c-bg-section; color: $c-font-detail; - font-weight: 700; + font-weight: $fonts-bold; } &__date, &__org { font-style: italic; - font-weight: 700; + font-weight: $fonts-bold; } &__org { diff --git a/assets/scss/02-molecules/_results-heading.scss b/assets/scss/02-molecules/_results-heading.scss index c084c37061..cc4eed7af4 100644 --- a/assets/scss/02-molecules/_results-heading.scss +++ b/assets/scss/02-molecules/_results-heading.scss @@ -22,7 +22,7 @@ line-height: 1.563rem; margin-bottom: .5em; text-transform: uppercase; - font-weight: 700; + font-weight: $fonts-bold; @media ($bp-x-small-min) { display: inline-block; diff --git a/assets/scss/02-molecules/_sticky-nav.scss b/assets/scss/02-molecules/_sticky-nav.scss index fc921607ee..39e35d7e0f 100644 --- a/assets/scss/02-molecules/_sticky-nav.scss +++ b/assets/scss/02-molecules/_sticky-nav.scss @@ -129,7 +129,7 @@ a { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; } &:hover a { @@ -149,7 +149,7 @@ a { @include ma-link-underline; - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/02-molecules/_tabs.scss b/assets/scss/02-molecules/_tabs.scss index 29f264db32..5440810e0a 100644 --- a/assets/scss/02-molecules/_tabs.scss +++ b/assets/scss/02-molecules/_tabs.scss @@ -29,7 +29,7 @@ padding-left: 1.4rem; padding-right: 1.4rem; color: $c-primary; - font-weight: 700; + font-weight: $fonts-bold; } } } diff --git a/assets/scss/02-molecules/_tags.scss b/assets/scss/02-molecules/_tags.scss index 94cea3f4fa..90371b5db9 100644 --- a/assets/scss/02-molecules/_tags.scss +++ b/assets/scss/02-molecules/_tags.scss @@ -15,6 +15,6 @@ line-height: 1em; padding: 9px 11px; color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/02-molecules/_tooltip-popup.scss b/assets/scss/02-molecules/_tooltip-popup.scss index 263eecaeeb..72d35af111 100644 --- a/assets/scss/02-molecules/_tooltip-popup.scss +++ b/assets/scss/02-molecules/_tooltip-popup.scss @@ -157,7 +157,7 @@ $dropdown-border-color: $border-color; color: $color; font-family: $font; font-size: 14px; - font-weight: 300; + font-weight: $fonts-lighter; line-height: 21px; text-align: left; padding: 28px; diff --git a/assets/scss/02-molecules/_tooltip.scss b/assets/scss/02-molecules/_tooltip.scss index 02553f5b58..669459fda5 100644 --- a/assets/scss/02-molecules/_tooltip.scss +++ b/assets/scss/02-molecules/_tooltip.scss @@ -149,7 +149,7 @@ font-weight: bold; &:after { - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/02-molecules/_wait-time.scss b/assets/scss/02-molecules/_wait-time.scss index 9e342e68f1..4d7c096864 100644 --- a/assets/scss/02-molecules/_wait-time.scss +++ b/assets/scss/02-molecules/_wait-time.scss @@ -98,7 +98,7 @@ &__label { color: $c-font-medium; - font-weight: 700; + font-weight: $fonts-bold; } &__time { @@ -106,6 +106,6 @@ } &__units { - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/03-organisms/_about-section.scss b/assets/scss/03-organisms/_about-section.scss index b143a7d463..96619edf1e 100644 --- a/assets/scss/03-organisms/_about-section.scss +++ b/assets/scss/03-organisms/_about-section.scss @@ -116,7 +116,7 @@ @include ma-h5; text-transform: uppercase; color: $c-primary-alt; - font-weight: 700; + font-weight: $fonts-bold; margin-bottom: 0; @media ($bp-small-min) { diff --git a/assets/scss/03-organisms/_action-card.scss b/assets/scss/03-organisms/_action-card.scss index 4155668097..c7a58be0ac 100644 --- a/assets/scss/03-organisms/_action-card.scss +++ b/assets/scss/03-organisms/_action-card.scss @@ -231,7 +231,7 @@ &__category { color: rgba($c-font-base,.85); - font-weight: 700; + font-weight: $fonts-bold; } &__item--blue &__category, diff --git a/assets/scss/03-organisms/_action-details.scss b/assets/scss/03-organisms/_action-details.scss index ec747c50d8..13eccd85cb 100644 --- a/assets/scss/03-organisms/_action-details.scss +++ b/assets/scss/03-organisms/_action-details.scss @@ -159,7 +159,7 @@ @include ma-heading-colored($c-primary-alt); color: $c-font-inverse; - font-weight: 700; + font-weight: $fonts-bold; } &__anchor-links { @@ -176,11 +176,11 @@ } a { - font-weight: 500; + font-weight: $fonts-normal; &.is-active { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; } &:hover { diff --git a/assets/scss/03-organisms/_action-finder.scss b/assets/scss/03-organisms/_action-finder.scss index 3dacc02899..7122135886 100644 --- a/assets/scss/03-organisms/_action-finder.scss +++ b/assets/scss/03-organisms/_action-finder.scss @@ -243,7 +243,7 @@ $action-finder-border-color: tint($c-primary,50%); &__category { color: $c-font-inverse; - font-weight: 500; + font-weight: $fonts-normal; } &--no-background &__category { diff --git a/assets/scss/03-organisms/_breadcrumbs.scss b/assets/scss/03-organisms/_breadcrumbs.scss index 7a6679dd87..502bb280dd 100644 --- a/assets/scss/03-organisms/_breadcrumbs.scss +++ b/assets/scss/03-organisms/_breadcrumbs.scss @@ -166,7 +166,7 @@ } &__label { - font-weight: 700; + font-weight: $fonts-bold; } &__item { diff --git a/assets/scss/03-organisms/_callout-message.scss b/assets/scss/03-organisms/_callout-message.scss index 9ec8007fa1..7a40cb38ae 100644 --- a/assets/scss/03-organisms/_callout-message.scss +++ b/assets/scss/03-organisms/_callout-message.scss @@ -44,7 +44,7 @@ h#{$i} { margin-top: 0; color: $c-font-heading; - font-weight: 700; + font-weight: $fonts-bold; @include ma-heading($i+1); } diff --git a/assets/scss/03-organisms/_callout-time.scss b/assets/scss/03-organisms/_callout-time.scss index 030b2707f8..fdfe8fa95c 100644 --- a/assets/scss/03-organisms/_callout-time.scss +++ b/assets/scss/03-organisms/_callout-time.scss @@ -56,6 +56,6 @@ &__text { color: $c-font-detail; - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/03-organisms/_callout.scss b/assets/scss/03-organisms/_callout.scss index e3b9eb53e1..33d63891d9 100644 --- a/assets/scss/03-organisms/_callout.scss +++ b/assets/scss/03-organisms/_callout.scss @@ -60,7 +60,7 @@ .ma__callout { border-left-color: $c-highlight; color: $c-font-heading; - font-weight: 800; + font-weight: $fonts-bolder; &__header { diff --git a/assets/scss/03-organisms/_collage-header.scss b/assets/scss/03-organisms/_collage-header.scss index 0a38d257f8..45fb2438b4 100644 --- a/assets/scss/03-organisms/_collage-header.scss +++ b/assets/scss/03-organisms/_collage-header.scss @@ -180,15 +180,15 @@ $collage-header-bp-max: "max-width: 700px"; h1 { color: $c-font-inverse; - font-weight: 400; + font-weight: $fonts-light; } } &__description { - font-weight: 300; + font-weight: $fonts-lighter; } &__lead { - font-weight: 400; + font-weight: $fonts-light; } } diff --git a/assets/scss/03-organisms/_contact-row.scss b/assets/scss/03-organisms/_contact-row.scss index 76de901c02..6d7f16cb18 100644 --- a/assets/scss/03-organisms/_contact-row.scss +++ b/assets/scss/03-organisms/_contact-row.scss @@ -101,7 +101,7 @@ $accordion-break: 720px; @include ma-chevron; font-size: 1.375rem; - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-link; padding-right: 10px; diff --git a/assets/scss/03-organisms/_error-page.scss b/assets/scss/03-organisms/_error-page.scss index 95e26151a4..01394de82f 100644 --- a/assets/scss/03-organisms/_error-page.scss +++ b/assets/scss/03-organisms/_error-page.scss @@ -54,15 +54,15 @@ &__type { color: $c-font-detail; - font-weight: 700; + font-weight: $fonts-bold; } &__title { - font-weight: 700; + font-weight: $fonts-bold; } &__message { color: $c-font-base; - font-weight: 300; + font-weight: $fonts-lighter; } } diff --git a/assets/scss/03-organisms/_event-listing.scss b/assets/scss/03-organisms/_event-listing.scss index de54ce4cd4..20d16b2a09 100644 --- a/assets/scss/03-organisms/_event-listing.scss +++ b/assets/scss/03-organisms/_event-listing.scss @@ -235,7 +235,7 @@ $event-listing-bp-show-grid: $bp-medium-min; &__empty { font-style: italic; - font-weight: 500; + font-weight: $fonts-normal; } &--grid &__item { diff --git a/assets/scss/03-organisms/_featured-item-mosaic.scss b/assets/scss/03-organisms/_featured-item-mosaic.scss index 9072227657..4d9d1ea9d0 100644 --- a/assets/scss/03-organisms/_featured-item-mosaic.scss +++ b/assets/scss/03-organisms/_featured-item-mosaic.scss @@ -126,7 +126,7 @@ .ma__featured-item-mosaic__toggle { color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; &:after { border-color: $c-font-link; diff --git a/assets/scss/03-organisms/_footer-slim.scss b/assets/scss/03-organisms/_footer-slim.scss index d6ebb1f2ce..0b69cd90fb 100644 --- a/assets/scss/03-organisms/_footer-slim.scss +++ b/assets/scss/03-organisms/_footer-slim.scss @@ -78,7 +78,7 @@ &:after { content: "|"; - font-weight: 100; + font-weight: $fonts-lightest; margin: 0 0.85rem; } @@ -92,7 +92,7 @@ &--contact { a { - font-weight: 500; + font-weight: $fonts-normal; } &> p { diff --git a/assets/scss/03-organisms/_footer.scss b/assets/scss/03-organisms/_footer.scss index 76ae719f51..d82dd01f22 100644 --- a/assets/scss/03-organisms/_footer.scss +++ b/assets/scss/03-organisms/_footer.scss @@ -138,10 +138,10 @@ &__copyright { color: $c-gray-dark; - font-weight: 300; + font-weight: $fonts-lighter; &--date { - font-weight: 500; + font-weight: $fonts-normal; } } diff --git a/assets/scss/03-organisms/_gen-teaser.scss b/assets/scss/03-organisms/_gen-teaser.scss index dc6c8b8736..0aa8cad02e 100644 --- a/assets/scss/03-organisms/_gen-teaser.scss +++ b/assets/scss/03-organisms/_gen-teaser.scss @@ -65,7 +65,7 @@ padding: 5px 7px; text-transform: uppercase; background-color: $c-bg-section; - font-weight: 700; + font-weight: $fonts-bold; } svg { @@ -133,7 +133,7 @@ margin-bottom: 1em; color: $c-font-dark; font-style: italic; - font-weight: 700; + font-weight: $fonts-bold; } &__date + &__org { diff --git a/assets/scss/03-organisms/_header-alert.scss b/assets/scss/03-organisms/_header-alert.scss index 76691ca7a3..c8745b1a09 100644 --- a/assets/scss/03-organisms/_header-alert.scss +++ b/assets/scss/03-organisms/_header-alert.scss @@ -56,12 +56,12 @@ background-color: $c-warning; &__hide { - font-weight: 700; + font-weight: $fonts-bold; } &__label { color: rgba($c-font-base, .7); - font-weight: 700; + font-weight: $fonts-bold; } &__message { diff --git a/assets/scss/03-organisms/_header-slim.scss b/assets/scss/03-organisms/_header-slim.scss index 7095bf93e4..6c6aabd1c0 100644 --- a/assets/scss/03-organisms/_header-slim.scss +++ b/assets/scss/03-organisms/_header-slim.scss @@ -8,7 +8,7 @@ a { transition: all 0.4s ease; text-decoration: none; - font-weight: 700; + font-weight: $fonts-bold; color: $c-primary; } @@ -49,7 +49,7 @@ width: 100%; & span { - font-weight: 400; + font-weight: $fonts-light; color: $c-primary-alt; -webkit-text-stroke-width: 1px; -webkit-text-stroke-color: $c-primary-alt; diff --git a/assets/scss/03-organisms/_header.scss b/assets/scss/03-organisms/_header.scss index dbc8199599..bb700422e6 100644 --- a/assets/scss/03-organisms/_header.scss +++ b/assets/scss/03-organisms/_header.scss @@ -251,7 +251,7 @@ body { text-transform: uppercase; transition: left .5s, visibility .5s; z-index: $z-dropdown; - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-inverse; .translated-rtl &, @@ -476,7 +476,7 @@ body { } &__menu-button { - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-inverse; span:first-child { @@ -522,7 +522,7 @@ body { &__backto { a { - font-weight: 500; + font-weight: $fonts-normal; background-color: tint($c-font-link, 90%); border-color: tint($c-font-link, 50%); box-shadow: 0 0.25rem 0.5rem rgba(#000, 0.25); diff --git a/assets/scss/03-organisms/_illustrated-header.scss b/assets/scss/03-organisms/_illustrated-header.scss index 80ace77569..57c2b806aa 100644 --- a/assets/scss/03-organisms/_illustrated-header.scss +++ b/assets/scss/03-organisms/_illustrated-header.scss @@ -80,7 +80,7 @@ $bp-illustrated-header-image-width: 360px; &__category { font-size: 1.375rem; - font-weight: 700; + font-weight: $fonts-bold; color: $c-font-detail; letter-spacing: $letter-spacing-large; text-transform: uppercase; @@ -145,7 +145,7 @@ $bp-illustrated-header-image-width: 360px; } &__category { - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/03-organisms/_image-credit.scss b/assets/scss/03-organisms/_image-credit.scss index c6650de0e9..d4c63f2cfe 100644 --- a/assets/scss/03-organisms/_image-credit.scss +++ b/assets/scss/03-organisms/_image-credit.scss @@ -32,7 +32,7 @@ } &__label { - font-weight: 700; + font-weight: $fonts-bold; } } } diff --git a/assets/scss/03-organisms/_image-link-list.scss b/assets/scss/03-organisms/_image-link-list.scss index ed7c06c498..08d5d84314 100644 --- a/assets/scss/03-organisms/_image-link-list.scss +++ b/assets/scss/03-organisms/_image-link-list.scss @@ -115,7 +115,7 @@ .ma__link-list__toggle { color: $c-font-link; - font-weight: 700; + font-weight: $fonts-bold; &:after { border-color: $c-font-link; diff --git a/assets/scss/03-organisms/_in-page-alert.scss b/assets/scss/03-organisms/_in-page-alert.scss index ca93f9b611..a7a3639fe3 100644 --- a/assets/scss/03-organisms/_in-page-alert.scss +++ b/assets/scss/03-organisms/_in-page-alert.scss @@ -8,7 +8,7 @@ @include ma-button-reset; font-size: 3rem; - font-weight: 700; + font-weight: $fonts-bold; line-height: .65; overflow: hidden; position: absolute; diff --git a/assets/scss/03-organisms/_jump-links.scss b/assets/scss/03-organisms/_jump-links.scss index 99de696a9e..a94cce0135 100644 --- a/assets/scss/03-organisms/_jump-links.scss +++ b/assets/scss/03-organisms/_jump-links.scss @@ -236,7 +236,7 @@ &__title { background-image: linear-gradient(-60deg, transparent, transparent 35px, $c-primary-alt 35px); color: $c-white; - font-weight: 700; + font-weight: $fonts-bold; } &__links { @@ -267,12 +267,12 @@ @media ($bp-small-max) { a { - font-weight: 500; + font-weight: $fonts-normal; } &.is-active a { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; } &.is-active:hover a { diff --git a/assets/scss/03-organisms/_key-message.scss b/assets/scss/03-organisms/_key-message.scss index b118634317..e800a8764e 100644 --- a/assets/scss/03-organisms/_key-message.scss +++ b/assets/scss/03-organisms/_key-message.scss @@ -37,7 +37,7 @@ $colors: ( .ma__key-message__sub-title { margin-top: 20px; - font-weight: 700; + font-weight: $fonts-bold; @each $class, $c in $colors { &--#{$class} { diff --git a/assets/scss/03-organisms/_link-list.scss b/assets/scss/03-organisms/_link-list.scss index 728085566e..e3777320b0 100644 --- a/assets/scss/03-organisms/_link-list.scss +++ b/assets/scss/03-organisms/_link-list.scss @@ -139,7 +139,7 @@ .ma__link-list { &__item { - font-weight: 700; + font-weight: $fonts-bold; } .sidebar &__item + &__item { diff --git a/assets/scss/03-organisms/_location-listing.scss b/assets/scss/03-organisms/_location-listing.scss index b107a3459c..a4c4cfa878 100644 --- a/assets/scss/03-organisms/_location-listing.scss +++ b/assets/scss/03-organisms/_location-listing.scss @@ -223,7 +223,7 @@ $location-listin--map-min-width: 315px; &__location { font-size: 1.25rem; - font-weight: 500; + font-weight: $fonts-normal; line-height: 1.15; padding-bottom: 0; @@ -275,11 +275,11 @@ $location-listin--map-min-width: 315px; } &__label { - font-weight: 500; + font-weight: $fonts-normal; } &__contact-info { - font-weight: 400; + font-weight: $fonts-light; } &__phone { diff --git a/assets/scss/03-organisms/_mass-feedback-form.scss b/assets/scss/03-organisms/_mass-feedback-form.scss index f1d9f6b771..002322dff9 100644 --- a/assets/scss/03-organisms/_mass-feedback-form.scss +++ b/assets/scss/03-organisms/_mass-feedback-form.scss @@ -62,7 +62,7 @@ $formQuickTransitions: max-height 0.3s linear; right: 5px; top: auto; font-size: 1rem; - font-weight: 400; + font-weight: $fonts-light; } } diff --git a/assets/scss/03-organisms/_organization-navigation-item.scss b/assets/scss/03-organisms/_organization-navigation-item.scss index b88653ff3a..479222d8af 100644 --- a/assets/scss/03-organisms/_organization-navigation-item.scss +++ b/assets/scss/03-organisms/_organization-navigation-item.scss @@ -79,7 +79,7 @@ border: 0; background-color: transparent; padding: 1rem 0; - font-weight: 700; + font-weight: $fonts-bold; font-size: 1rem; color: $c-black; @@ -186,7 +186,7 @@ @media ($bp-large-max) { font-size: 1.375rem; - font-weight: 500; + font-weight: $fonts-normal; color: $c-primary; margin-bottom: 0; padding-bottom: 1rem; @@ -269,7 +269,7 @@ @media ($bp-large-max) { font-size: 1.375rem; - font-weight: 500; + font-weight: $fonts-normal; } } @@ -285,7 +285,7 @@ @media ($bp-large-min) { display: inline-block; - font-weight: 700; + font-weight: $fonts-bold; background-color: $c-white; outline: 3px solid rgba($c-primary, 0.5); padding: 0.2rem 0.5rem; @@ -319,7 +319,7 @@ @media ($bp-large-max) { font-size: 1.375rem; - font-weight: 500; + font-weight: $fonts-normal; } @media ($bp-large-min) { @@ -467,7 +467,7 @@ white-space: nowrap; display: inline-block; width: 100%; - font-weight: 700; + font-weight: $fonts-bold; } .custom-option-item__label svg { diff --git a/assets/scss/03-organisms/_organization-navigation.scss b/assets/scss/03-organisms/_organization-navigation.scss index df1724abef..fae6440fee 100644 --- a/assets/scss/03-organisms/_organization-navigation.scss +++ b/assets/scss/03-organisms/_organization-navigation.scss @@ -62,7 +62,7 @@ $menu-transition-time: 0.3s; justify-content: space-between; align-items: center; font-size: 1.25rem; - font-weight: 700; + font-weight: $fonts-bold; line-height: 1.2; color: $c-font-dark; border-bottom: 1px solid $c-gray-light; @@ -110,7 +110,7 @@ $menu-transition-time: 0.3s; &::after { content: $close-icon; font-size: 2.1rem; - font-weight: 500; + font-weight: $fonts-normal; line-height: 0; position: absolute; top: 50%; @@ -246,7 +246,7 @@ $menu-transition-time: 0.3s; background-color: transparent; border-left: 1px solid $c-gray-light; font-size: 1rem; - font-weight: 700; + font-weight: $fonts-bold; padding-left: 35px; @media ($bp-large-min) { @@ -263,7 +263,7 @@ $menu-transition-time: 0.3s; font-size: 1.125rem; padding-right: 1.5rem; padding-left: 1rem; - font-weight: 500; + font-weight: $fonts-normal; &::after { color: $c-primary-alt; diff --git a/assets/scss/03-organisms/_page-banner.scss b/assets/scss/03-organisms/_page-banner.scss index 5fcea9bace..62ca9dcfec 100644 --- a/assets/scss/03-organisms/_page-banner.scss +++ b/assets/scss/03-organisms/_page-banner.scss @@ -362,7 +362,7 @@ $page-banner-height: 330px; .ma__decorative-link a, &__unlinked-title { - font-weight: 500; + font-weight: $fonts-normal; } .ma__decorative-link + &__description, @@ -493,17 +493,17 @@ $page-banner-inner-width: 612px; } &__title { - font-weight: 400; + font-weight: $fonts-light; color: $c-font-inverse; } &__description { color: $c-font-inverse; - font-weight: 500; + font-weight: $fonts-normal; .ma__page-banner__descriptionSubText { display: block; - font-weight: 300; + font-weight: $fonts-lighter; } } @@ -529,6 +529,6 @@ $page-banner-inner-width: 612px; &--columns &__description { color: $c-font-base; - font-weight: 400; + font-weight: $fonts-light; } } diff --git a/assets/scss/03-organisms/_page-header.scss b/assets/scss/03-organisms/_page-header.scss index a947c362bf..cb8a14544a 100644 --- a/assets/scss/03-organisms/_page-header.scss +++ b/assets/scss/03-organisms/_page-header.scss @@ -182,7 +182,7 @@ $page-header-widget-width: 350px; font-size: 1.375rem; padding-bottom: 1rem; line-height: 1.1; - font-weight: 700; + font-weight: $fonts-bold; letter-spacing: $letter-spacing-large; text-transform: uppercase; } @@ -372,7 +372,7 @@ $page-header-widget-width: 350px; &__sub-title { color: $c-font-heading; - font-weight: 700; + font-weight: $fonts-bold; } &__optional-content { diff --git a/assets/scss/03-organisms/_person-card.scss b/assets/scss/03-organisms/_person-card.scss index 5cad48b809..fbac1f70eb 100644 --- a/assets/scss/03-organisms/_person-card.scss +++ b/assets/scss/03-organisms/_person-card.scss @@ -21,7 +21,7 @@ h2 { margin-bottom: 0; padding-bottom: 5px; - font-weight: 500; + font-weight: $fonts-normal; @media ($bp-small-min) { font-size: 2.25rem; @@ -61,7 +61,7 @@ span { display: block; line-height: 1; - font-weight: 500; + font-weight: $fonts-normal; font-size: 1.25rem; } } diff --git a/assets/scss/03-organisms/_press-filters.scss b/assets/scss/03-organisms/_press-filters.scss index 881a9b5fab..80c28b5340 100644 --- a/assets/scss/03-organisms/_press-filters.scss +++ b/assets/scss/03-organisms/_press-filters.scss @@ -104,7 +104,7 @@ &__clear { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; border-bottom-color: $c-font-base; } } diff --git a/assets/scss/03-organisms/_pullquote.scss b/assets/scss/03-organisms/_pullquote.scss index c611a851b9..4a79c45c12 100644 --- a/assets/scss/03-organisms/_pullquote.scss +++ b/assets/scss/03-organisms/_pullquote.scss @@ -12,7 +12,7 @@ display: block; padding-top: 35px; font-size: 1.875rem; - font-weight: 700; + font-weight: $fonts-bold; line-height: 1.285; color: $c-gray-dark; diff --git a/assets/scss/03-organisms/_related-orgs-and-topics.scss b/assets/scss/03-organisms/_related-orgs-and-topics.scss index a486cc84ad..cbb5aee235 100644 --- a/assets/scss/03-organisms/_related-orgs-and-topics.scss +++ b/assets/scss/03-organisms/_related-orgs-and-topics.scss @@ -91,7 +91,7 @@ .ma__related-orgs-and-topics--toggle { position: relative; color: $c-primary; - font-weight: 700; + font-weight: $fonts-bold; background-color: transparent; border: none; padding: 3px 20px 1px; diff --git a/assets/scss/03-organisms/_rich-text.scss b/assets/scss/03-organisms/_rich-text.scss index 9ad1af57a1..edd5116036 100644 --- a/assets/scss/03-organisms/_rich-text.scss +++ b/assets/scss/03-organisms/_rich-text.scss @@ -263,7 +263,7 @@ $heading-indent: $gutter; } h5 { - font-weight: 700; + font-weight: $fonts-bold; } a { diff --git a/assets/scss/03-organisms/_search-banner.scss b/assets/scss/03-organisms/_search-banner.scss index 40ae6d7e70..0939b42014 100644 --- a/assets/scss/03-organisms/_search-banner.scss +++ b/assets/scss/03-organisms/_search-banner.scss @@ -286,12 +286,12 @@ h1 { color: $c-font-inverse; - font-weight: 300; + font-weight: $fonts-lighter; } &__sub-title { color: $c-font-inverse; - font-weight: 400; + font-weight: $fonts-light; } } @@ -299,44 +299,44 @@ &__title { color: $c-font-inverse; - font-weight: 300; + font-weight: $fonts-lighter; } // backward compatible with v5.6 - intro was replaced with Page Intro &__intro { color: $c-font-inverse; - font-weight: 400; + font-weight: $fonts-light; } &__input { input { background-color: rgba(255, 255, 255, 0.75); - font-weight: 300; + font-weight: $fonts-lighter; } &::-webkit-input-placeholder { color: $c-font-medium; - font-weight: 300; + font-weight: $fonts-lighter; font-style: italic; } &:-moz-placeholder { /* Firefox 18- */ color: $c-font-medium; - font-weight: 300; + font-weight: $fonts-lighter; font-style: italic; } &::-moz-placeholder { /* Firefox 19+ */ color: $c-font-medium; - font-weight: 300; + font-weight: $fonts-lighter; font-style: italic; } &:-ms-input-placeholder { color: $c-font-medium; - font-weight: 300; + font-weight: $fonts-lighter; font-style: italic; } } @@ -344,7 +344,7 @@ &__button { background-color: rgba(255, 255, 255, 0.75); color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; & > svg { fill: $c-font-dark; @@ -368,7 +368,7 @@ .ma__decorative-link a { color: $c-font-inverse; - font-weight: 400; + font-weight: $fonts-light; &:hover { border-bottom-color: rgba($c-font-inverse, .5); @@ -407,12 +407,12 @@ &__image-name { color: rgba($c-font-inverse,.9); - font-weight: 400; + font-weight: $fonts-light; } &__image-author { color: rgba($c-font-inverse, .5); - font-weight: 400; + font-weight: $fonts-light; } // End backward compatible with v5.7 - converted image-credit to new Banner Credit molecule } diff --git a/assets/scss/03-organisms/_steps-ordered.scss b/assets/scss/03-organisms/_steps-ordered.scss index bc716fa882..4b4f394bfd 100644 --- a/assets/scss/03-organisms/_steps-ordered.scss +++ b/assets/scss/03-organisms/_steps-ordered.scss @@ -84,7 +84,7 @@ $steps-ordered-icon-border: 3px; &:before { color: $c-primary-alt; - font-weight: 700; + font-weight: $fonts-bold; } } } diff --git a/assets/scss/03-organisms/_sticky-toc.scss b/assets/scss/03-organisms/_sticky-toc.scss index ce0fab5f2a..3f9bb36c87 100644 --- a/assets/scss/03-organisms/_sticky-toc.scss +++ b/assets/scss/03-organisms/_sticky-toc.scss @@ -184,7 +184,7 @@ &__title { background-image: linear-gradient(-60deg, transparent, transparent 35px, $c-primary-alt 35px); color: $c-white; - font-weight: 700; + font-weight: $fonts-bold; } &__links { @@ -230,12 +230,12 @@ @media ($bp-x-small-max) { a { - font-weight: 500; + font-weight: $fonts-normal; } &.is-active a { color: $c-font-base; - font-weight: 700; + font-weight: $fonts-bold; } &.is-active:hover a { @@ -268,7 +268,7 @@ button { position: relative; color: $c-primary; - font-weight: 700; + font-weight: $fonts-bold; background-color: transparent; border: none; padding: 3px 20px 1px; @@ -372,7 +372,7 @@ display: block; text-transform: uppercase; font-size: 0.75rem; - font-weight: 700; + font-weight: $fonts-bold; color: $c-primary; letter-spacing: $letter-spacing-large; margin-top: -4px; @@ -395,7 +395,7 @@ .ma__sticky-toc__secondary-label { font-size: 20px; - font-weight: 700; + font-weight: $fonts-bold; line-height: 1.2; padding: 10px 35px 10px 15px; border: 1px solid $c-bd-divider; @@ -437,7 +437,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - font-weight: 700; + font-weight: $fonts-bold; color: $c-black; margin-bottom: 0; display: none; @@ -478,7 +478,7 @@ justify-content: space-between; border: 0; font-size: 1.375rem; - font-weight: 500; + font-weight: $fonts-normal; letter-spacing: $letter-spacing-large; text-transform: uppercase; color: $c-gray-dark; @@ -508,7 +508,7 @@ margin: 0 20px; a { - font-weight: 700; + font-weight: $fonts-bold; font-size: 1.375rem; display: flex; diff --git a/assets/scss/03-organisms/_tab-container.scss b/assets/scss/03-organisms/_tab-container.scss index de8ea5072f..bfb9aa0030 100644 --- a/assets/scss/03-organisms/_tab-container.scss +++ b/assets/scss/03-organisms/_tab-container.scss @@ -73,7 +73,7 @@ button { padding-top: 1.5rem; - font-weight: 700; + font-weight: $fonts-bold; color: $c-primary; @extend %focus; diff --git a/assets/scss/03-organisms/_teaser-listing-group.scss b/assets/scss/03-organisms/_teaser-listing-group.scss index 7c0bbfd3e2..b13849582a 100644 --- a/assets/scss/03-organisms/_teaser-listing-group.scss +++ b/assets/scss/03-organisms/_teaser-listing-group.scss @@ -29,7 +29,7 @@ .ma__teaser-listing-group__toggle { margin-top: 30px; - font-weight: 700; + font-weight: $fonts-bold; border: 0; padding-left: 0; background: transparent; diff --git a/assets/scss/03-organisms/_teaser-listing.scss b/assets/scss/03-organisms/_teaser-listing.scss index 010b29af07..5e7fbd08d4 100644 --- a/assets/scss/03-organisms/_teaser-listing.scss +++ b/assets/scss/03-organisms/_teaser-listing.scss @@ -223,7 +223,7 @@ .ma__content-link--chevron.ma__content-link__acordion-toggle { font-size: 1.25rem; - font-weight: 700; + font-weight: $fonts-bold; border: 0; padding-left: 0; background: transparent; diff --git a/assets/scss/03-organisms/_teaser.scss b/assets/scss/03-organisms/_teaser.scss index f41a3fabb9..44d1b49d02 100644 --- a/assets/scss/03-organisms/_teaser.scss +++ b/assets/scss/03-organisms/_teaser.scss @@ -79,7 +79,7 @@ $c-theme-green: #43956f; padding: 5px 7px; text-transform: uppercase; background-color: $c-bg-section; - font-weight: 700; + font-weight: $fonts-bold; } } @@ -123,7 +123,7 @@ $c-theme-green: #43956f; margin-bottom: 1em; color: $c-font-dark; font-style: italic; - font-weight: 700; + font-weight: $fonts-bold; } &__date + &__org { @@ -276,7 +276,7 @@ $c-theme-green: #43956f; .ma__website { a { - font-weight: 500; + font-weight: $fonts-normal; } svg { @@ -291,7 +291,7 @@ $c-theme-green: #43956f; line-height: 27px; a { - font-weight: 500; + font-weight: $fonts-normal; } svg { diff --git a/assets/scss/03-organisms/_transition-page.scss b/assets/scss/03-organisms/_transition-page.scss index 84b30be262..4b887d01a0 100644 --- a/assets/scss/03-organisms/_transition-page.scss +++ b/assets/scss/03-organisms/_transition-page.scss @@ -47,6 +47,6 @@ } &__message { - font-weight: 700; + font-weight: $fonts-bold; } } diff --git a/assets/scss/03-organisms/_utility-nav.scss b/assets/scss/03-organisms/_utility-nav.scss index 064f15ac5e..9719353862 100644 --- a/assets/scss/03-organisms/_utility-nav.scss +++ b/assets/scss/03-organisms/_utility-nav.scss @@ -93,7 +93,7 @@ $utility-nav-height: 43px; span { font-family: $fonts; - font-weight: 500; + font-weight: $fonts-normal; } } @@ -151,14 +151,14 @@ $utility-nav-height: 43px; .goog-te-gadget { font-size: 1.25rem; - font-weight: 400; + font-weight: $fonts-light; } .goog-te-gadget-simple { font-size: 1.25rem; background-color: transparent; border: none; - font-weight: 500; + font-weight: $fonts-normal; @media ($bp-header-toggle-max) { padding: 11px 0 9px 45px; @@ -342,7 +342,7 @@ $utility-nav-height: 43px; @include ma-button-reset; cursor: pointer; font-size: 1rem; - font-weight: 700; + font-weight: $fonts-bold; position: absolute; top: 0; right: 35px; @@ -370,7 +370,7 @@ $utility-nav-height: 43px; line-height: .5em; margin-left: .2em; transform: rotate(45deg); - font-weight: 400; + font-weight: $fonts-light; } &__content-title { @@ -380,7 +380,7 @@ $utility-nav-height: 43px; vertical-align: middle; font-size: 1.625rem; line-height: 1.45; - font-weight: 500; + font-weight: $fonts-normal; margin-bottom: 0; color: $c-white; } diff --git a/assets/scss/03-organisms/_utility-panel.scss b/assets/scss/03-organisms/_utility-panel.scss index 47604f536e..ba5542f01b 100644 --- a/assets/scss/03-organisms/_utility-panel.scss +++ b/assets/scss/03-organisms/_utility-panel.scss @@ -15,7 +15,7 @@ $bp-utility-panel-reduce-links-max: "max-width:1120px"; &__description { font-size: 1.25rem; - font-weight: 300; + font-weight: $fonts-lighter; line-height: 1.5; margin-bottom: 15px; margin-right: 2%; @@ -76,7 +76,7 @@ $bp-utility-panel-reduce-links-max: "max-width:1120px"; margin: 0; text-align: left; color: $c-font-inverse; - font-weight: 500; + font-weight: $fonts-normal; @media ($bp-header-toggle-min) and ($bp-utility-panel-reduce-links-max) { font-size: 1.25rem; diff --git a/changelogs/template.yml b/changelogs/DP-18591.yml similarity index 100% rename from changelogs/template.yml rename to changelogs/DP-18591.yml diff --git a/react/package-lock.json b/react/package-lock.json index 10cbcb5497..e03ed51398 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -10604,8 +10604,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -10626,14 +10625,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -10648,20 +10645,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -10778,8 +10772,7 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -10791,7 +10784,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -10806,7 +10798,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -10814,14 +10805,12 @@ "minimist": { "version": "1.2.5", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.9.0", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -10840,7 +10829,6 @@ "version": "0.5.3", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "^1.2.5" } @@ -10902,8 +10890,7 @@ "npm-normalize-package-bin": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "npm-packlist": { "version": "1.4.8", @@ -10931,8 +10918,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -10944,7 +10930,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -11022,8 +11007,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -11059,7 +11043,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11079,7 +11062,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -11123,14 +11105,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -26322,8 +26302,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -26344,14 +26323,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -26366,20 +26343,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -26496,8 +26470,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -26509,7 +26482,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -26524,7 +26496,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -26532,14 +26503,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -26558,7 +26527,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -26639,8 +26607,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -26652,7 +26619,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -26738,8 +26704,7 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -26775,7 +26740,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -26795,7 +26759,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -26839,14 +26802,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true } } },