From 044317ec2d860337d5f696bee4e078eb96799056 Mon Sep 17 00:00:00 2001 From: Jon Jensen Date: Mon, 25 Nov 2024 11:24:41 -0800 Subject: [PATCH 1/3] Update ca.gov logo --- pages/_includes/statewide-footer.njk | 43 +++++++++++----------------- pages/_includes/statewide-header.njk | 38 ++++++------------------ src/css/_theme-overrides.scss | 33 +++++++++++++++++++-- 3 files changed, 55 insertions(+), 59 deletions(-) diff --git a/pages/_includes/statewide-footer.njk b/pages/_includes/statewide-footer.njk index e25f1ad2..d45c2f45 100644 --- a/pages/_includes/statewide-footer.njk +++ b/pages/_includes/statewide-footer.njk @@ -2,33 +2,22 @@
diff --git a/pages/_includes/statewide-header.njk b/pages/_includes/statewide-header.njk index 539cffca..e2d4da57 100644 --- a/pages/_includes/statewide-header.njk +++ b/pages/_includes/statewide-header.njk @@ -2,35 +2,15 @@
diff --git a/src/css/_theme-overrides.scss b/src/css/_theme-overrides.scss index 35d6f805..9895f2f2 100644 --- a/src/css/_theme-overrides.scss +++ b/src/css/_theme-overrides.scss @@ -18,9 +18,6 @@ cagov-site-navigation, .site-header { background: transparent; border-bottom: solid 1px var(--primary-color, #0D4F8C); } -.official-header svg .gov { - fill: var(--white,#fff); -} h1, h2, h3, h4, h5, h6 { color: var(--primary-color, #0D4F8C); font-family: 'Noto Serif', serif; @@ -47,4 +44,34 @@ h3 { font-weight: normal; padding-left: 1rem; padding-right: 1rem; +} + +/* Add new ca.gov logo to header and footer. */ +.official-header svg { + width: unset; + height: 24px; +} +.official-header svg .cls-1 { + fill: #fff; + stroke-width: 0px; +} +footer .bg-light-grey a, footer .copyright { + padding: 0; +} +footer .cagov-logo svg { + display: block; + margin-right: var(--s-3); + height: 24px; +} +footer .cagov-logo svg .cls-1 { + fill: url(#linear-gradient); +} +footer .cagov-logo svg .cls-1, .cls-2, .cls-3 { + stroke-width: 0px; +} +footer .cagov-logo svg .cls-2 { + fill: url(#linear-gradient-2); +} +footer .cagov-logo svg .cls-3 { + fill: #f26724; } \ No newline at end of file From a50039fee63cacc70e9967dd8f6d977eda6c79a6 Mon Sep 17 00:00:00 2001 From: Jon Jensen Date: Mon, 25 Nov 2024 11:34:48 -0800 Subject: [PATCH 2/3] Remove IDs from new SVGs, pass tests --- pages/_includes/statewide-footer.njk | 8 ++++---- pages/_includes/statewide-header.njk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/_includes/statewide-footer.njk b/pages/_includes/statewide-footer.njk index d45c2f45..e3a333a9 100644 --- a/pages/_includes/statewide-footer.njk +++ b/pages/_includes/statewide-footer.njk @@ -2,19 +2,19 @@