diff --git a/.eleventy.js b/.eleventy.js index e256eff8..f65f9b7f 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -105,7 +105,7 @@ module.exports = function (eleventyConfig) { //eleventyConfig.addPassthroughCopy({ "_includes/theme/fonts": "theme/fonts" }); //eleventyConfig.addPassthroughCopy({ "node_modules/@uswds/uswds/dist/fonts": "assets/fonts" }); eleventyConfig.addPassthroughCopy({ "_includes/theme/images": "assets/images" }); - eleventyConfig.addPassthroughCopy({ "reports/pdfs": "reports" }); + eleventyConfig.addPassthroughCopy({ "reports/pdfs": "impact" }); eleventyConfig.addPassthroughCopy({ "node_modules/@uswds/uswds/img": "assets/uswds/img" }); // eleventyConfig.addPassthroughCopy({ "_includes/theme/uswds-2.10.1-dist/js": "assets/theme/uswds/js" }); diff --git a/_data/assetPaths.json b/_data/assetPaths.json index 00919b42..cd9c1d6f 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -7,16 +7,16 @@ "Latin-Merriweather-Regular.woff2": "/assets/assets/Latin-Merriweather-Regular-EYXYAATC.woff2", "Poppins-Bold.woff2": "/assets/assets/Poppins-Bold-3GBDYPWO.woff2", "Poppins-BoldItalic.woff2": "/assets/assets/Poppins-BoldItalic-2VJWFQLM.woff2", + "Poppins-Italic.woff2": "/assets/assets/Poppins-Italic-F6OTYX7T.woff2", "Poppins-Light.woff2": "/assets/assets/Poppins-Light-36KYKMDJ.woff2", "Poppins-LightItalic.woff2": "/assets/assets/Poppins-LightItalic-IX33PQO5.woff2", "Poppins-Regular.woff2": "/assets/assets/Poppins-Regular-CQW4ZHRL.woff2", - "ableist-ui-demo-800px-opt.gif": "/assets/assets/ableist-ui-demo-800px-opt-BR3MFL55.gif", "add.svg": "/assets/assets/add-XJXD7HSN.svg", "arrow_back.svg": "/assets/assets/arrow_back-NBHWBQVI.svg", "calendar_today.svg": "/assets/assets/calendar_today-3TYM6CKQ.svg", - "callout-green-full-lg.png": "/assets/assets/callout-green-full-lg-AA7NZKYB.png", - "callout-lilac-full-lg.png": "/assets/assets/callout-lilac-full-lg-Q4C5KZDB.png", - "callout-lilac-half-lg.png": "/assets/assets/callout-lilac-half-lg-QSVKYYFZ.png", + "callout-green-full-lg.webp": "/assets/assets/callout-green-full-lg-XZJ55ZMM.webp", + "callout-lilac-full-lg.webp": "/assets/assets/callout-lilac-full-lg-XLX5SHBI.webp", + "callout-lilac-half-lg.webp": "/assets/assets/callout-lilac-half-lg-R26T4MIX.webp", "check--blue-60v.svg": "/assets/assets/check--blue-60v-PCQB53AU.svg", "check_circle.svg": "/assets/assets/check_circle-FKYRF36F.svg", "checkbox-indeterminate.svg": "/assets/assets/checkbox-indeterminate-HJACJSU3.svg", @@ -24,6 +24,7 @@ "close.svg": "/assets/assets/close-D6X4FKTZ.svg", "correct8.svg": "/assets/assets/correct8-BW6WT7U2.svg", "correct8-alt.svg": "/assets/assets/correct8-alt-M4H3GT6Q.svg", + "delna.webp": "/assets/assets/delna-Y7FFIQ4T.webp", "error--white.svg": "/assets/assets/error--white-XMM7ATFA.svg", "error.svg": "/assets/assets/error-3VQTC4AF.svg", "expand_less.svg": "/assets/assets/expand_less-RBECZ4GA.svg", @@ -33,12 +34,14 @@ "file-pdf.svg": "/assets/assets/file-pdf-JIOM4YQ2.svg", "file-video.svg": "/assets/assets/file-video-EG2XXN3X.svg", "file-word.svg": "/assets/assets/file-word-LAS3SDGR.svg", + "frank.webp": "/assets/assets/frank-WEGTXKFN.webp", "header-bottom-border.webp": "/assets/assets/header-bottom-border-K2INIIYM.webp", "hero.jpg": "/assets/assets/hero-OXUBFI7L.jpg", "homepage-gradient-bg.jpg": "/assets/assets/homepage-gradient-bg-L552LDA4.jpg", "homepage-gradient-bg-mobile.jpg": "/assets/assets/homepage-gradient-bg-mobile-7NX7I3DV.jpg", - "impact-report_pdf-icon.png": "/assets/assets/impact-report_pdf-icon-XZRCPUZL.png", + "impact-report_pdf-icon.webp": "/assets/assets/impact-report_pdf-icon-ARH2FAXH.webp", "info.svg": "/assets/assets/info-TBKQSD4V.svg", + "jim.webp": "/assets/assets/jim-YNT2QTL4.webp", "launch--white.svg": "/assets/assets/launch--white-RFNMNFON.svg", "launch.svg": "/assets/assets/launch-ITYHD56Q.svg", "loader.svg": "/assets/assets/loader-XRERFQEW.svg", @@ -47,26 +50,27 @@ "navigate_far_before.svg": "/assets/assets/navigate_far_before-GSWMTOHQ.svg", "navigate_far_next.svg": "/assets/assets/navigate_far_next-EC44VNMY.svg", "navigate_next.svg": "/assets/assets/navigate_next-EH2RHTK7.svg", - "portfolio-paint-stroke-1.png": "/assets/assets/portfolio-paint-stroke-1-AGEVRO3B.png", - "portfolio-paint-stroke-1-v.png": "/assets/assets/portfolio-paint-stroke-1-v-HYH6CCTI.png", - "portfolio-paint-stroke-2.png": "/assets/assets/portfolio-paint-stroke-2-3YWRCN5F.png", - "portfolio-paint-stroke-2-v.png": "/assets/assets/portfolio-paint-stroke-2-v-CHRL2BBD.png", - "portfolio-paint-stroke-3.png": "/assets/assets/portfolio-paint-stroke-3-BGLH6ZS4.png", - "portfolio-paint-stroke-3-v.png": "/assets/assets/portfolio-paint-stroke-3-v-BZ3HXSUZ.png", - "portfolio-paint-stroke-4.png": "/assets/assets/portfolio-paint-stroke-4-H5J4BXZM.png", - "portfolio-paint-stroke-4-v.png": "/assets/assets/portfolio-paint-stroke-4-v-FKV47AXI.png", - "portfolio-paint-stroke-5.png": "/assets/assets/portfolio-paint-stroke-5-4RVRY2L5.png", - "portfolio-paint-stroke-5-v.png": "/assets/assets/portfolio-paint-stroke-5-v-WPBWGNWZ.png", - "portfolio-paint-stroke-6.png": "/assets/assets/portfolio-paint-stroke-6-MZPAIYPK.png", - "portfolio-paint-stroke-6-v.png": "/assets/assets/portfolio-paint-stroke-6-v-Q5Q23WM3.png", + "portfolio-paint-stroke-1.png": "/assets/assets/portfolio-paint-stroke-1-BT6O5O7C.png", + "portfolio-paint-stroke-1-v.png": "/assets/assets/portfolio-paint-stroke-1-v-RTELLBUD.png", + "portfolio-paint-stroke-2.png": "/assets/assets/portfolio-paint-stroke-2-IYZESJZT.png", + "portfolio-paint-stroke-2-v.png": "/assets/assets/portfolio-paint-stroke-2-v-ADHGV4VY.png", + "portfolio-paint-stroke-3.png": "/assets/assets/portfolio-paint-stroke-3-W2SSUFEU.png", + "portfolio-paint-stroke-3-v.png": "/assets/assets/portfolio-paint-stroke-3-v-74W3M462.png", + "portfolio-paint-stroke-4.png": "/assets/assets/portfolio-paint-stroke-4-KBEKFOJW.png", + "portfolio-paint-stroke-4-v.png": "/assets/assets/portfolio-paint-stroke-4-v-75WFJ4MT.png", + "portfolio-paint-stroke-5.png": "/assets/assets/portfolio-paint-stroke-5-FY6PLBWZ.png", + "portfolio-paint-stroke-5-v.png": "/assets/assets/portfolio-paint-stroke-5-v-S5HFBMXY.png", + "portfolio-paint-stroke-6.png": "/assets/assets/portfolio-paint-stroke-6-VLCBIA6C.png", + "portfolio-paint-stroke-6-v.png": "/assets/assets/portfolio-paint-stroke-6-v-GBSGMNIF.png", "remove.svg": "/assets/assets/remove-6IAU2W4S.svg", - "report-1-bg.png": "/assets/assets/report-1-bg-4DA7CIY3.png", - "report-1-bg-mobile.png": "/assets/assets/report-1-bg-mobile-JB5WV2AI.png", - "report-1-bg-tablet.png": "/assets/assets/report-1-bg-tablet-R4QCU4X5.png", - "report-gradient-separator.png": "/assets/assets/report-gradient-separator-B22CUQ6N.png", - "report-green-brush-stroke.png": "/assets/assets/report-green-brush-stroke-WPU7KT5H.png", - "report-lilac-brush-stroke.png": "/assets/assets/report-lilac-brush-stroke-MHCJC7WW.png", - "report-nav-active-bar.png": "/assets/assets/report-nav-active-bar-LAQEKIMJ.png", + "report-1-bg.png": "/assets/assets/report-1-bg-C3ZMOMYT.png", + "report-1-bg-mobile.png": "/assets/assets/report-1-bg-mobile-7YWW4XSQ.png", + "report-1-bg-tablet.png": "/assets/assets/report-1-bg-tablet-NWSNE6A3.png", + "report-gradient-separator.webp": "/assets/assets/report-gradient-separator-BFERC5QK.webp", + "report-green-brush-stroke.webp": "/assets/assets/report-green-brush-stroke-JFPXNXZQ.webp", + "report-green-separator.webp": "/assets/assets/report-green-separator-B365AIK4.webp", + "report-lilac-brush-stroke.png": "/assets/assets/report-lilac-brush-stroke-M7XHI42Z.png", + "report-nav-active-bar.png": "/assets/assets/report-nav-active-bar-OOHI5OAH.png", "roboto-mono-v5-latin-300.woff2": "/assets/assets/roboto-mono-v5-latin-300-UE3MSWKN.woff2", "roboto-mono-v5-latin-300italic.woff2": "/assets/assets/roboto-mono-v5-latin-300italic-L54VLD6K.woff2", "roboto-mono-v5-latin-700.woff2": "/assets/assets/roboto-mono-v5-latin-700-3IFUE232.woff2", @@ -75,12 +79,12 @@ "roboto-mono-v5-latin-regular.woff2": "/assets/assets/roboto-mono-v5-latin-regular-OEH334AX.woff2", "search.svg": "/assets/assets/search-2D3FZK3P.svg", "section2-purple-bg.webp": "/assets/assets/section2-purple-bg-NLRL7WNF.webp", - "the-10x-team.png": "/assets/assets/the-10x-team-MTDVPVQ6.png", + "the-10x-team.webp": "/assets/assets/the-10x-team-77VTG5RX.webp", "tts-inclusive-grid-map.svg": "/assets/assets/tts-inclusive-grid-map-D5DPHQNA.svg", "unfold_more.svg": "/assets/assets/unfold_more-WL443JWS.svg", "warning.svg": "/assets/assets/warning-5OR6W6GJ.svg", "app.js": "/assets/js/app-EDZES2YK.js", "app.map": "/assets/js/app-EDZES2YK.js.map", - "index.css": "/assets/styles/index-GVPBJ6VO.css", - "index.map": "/assets/styles/index-GVPBJ6VO.css.map" + "index.css": "/assets/styles/index-6NLQABYQ.css", + "index.map": "/assets/styles/index-6NLQABYQ.css.map" } \ No newline at end of file diff --git a/_includes/components/about-side-nav.html b/_includes/components/about-side-nav.html index 411b485d..dce9c162 100644 --- a/_includes/components/about-side-nav.html +++ b/_includes/components/about-side-nav.html @@ -13,7 +13,7 @@ - {{ aboutPage.data.pageTitle }} + {{ aboutPage.data.hero_banner.title }} {%- endfor -%} diff --git a/_includes/components/gradient-hero-banner.html b/_includes/components/gradient-hero-banner.html new file mode 100644 index 00000000..b3769517 --- /dev/null +++ b/_includes/components/gradient-hero-banner.html @@ -0,0 +1,31 @@ +{% assign formatted_category = hero_banner.category | replace: ' ', '-' | downcase %} + + \ No newline at end of file diff --git a/_includes/components/header.html b/_includes/components/header.html index 8af33d12..b29b17a1 100644 --- a/_includes/components/header.html +++ b/_includes/components/header.html @@ -60,8 +60,7 @@
@@ -75,9 +74,16 @@ {%- for entry in navPages %} {% assign isCurrent = false %} {% assign hasChildren = false %} + {% assign lowercase_entry_title = entry.title | downcase %} + {%- if entry.url == page.url or page.url contains entry.url -%} {% assign isCurrent = true %} - {%- endif -%} + {% elsif entry.title == 'Impact' and page.url contains '/impact' %} + {% assign isCurrent = true %} + {% elsif not page.url contains 'fy23-impact-report' and page.url contains 'impact' and lowercase_entry_title contains 'impact' %} + {% assign isCurrent = true %} + {% endif %} + {%- if entry.children.length > 0 -%} {% assign hasChildren = true %} {%- endif -%} diff --git a/_includes/components/impact-breadcrumb.html b/_includes/components/impact-breadcrumb.html new file mode 100644 index 00000000..955de9c5 --- /dev/null +++ b/_includes/components/impact-breadcrumb.html @@ -0,0 +1,27 @@ +
+
+ +
+
\ No newline at end of file diff --git a/_includes/components/posts-list.html b/_includes/components/posts-list.html index 808b9bc0..8af588b2 100644 --- a/_includes/components/posts-list.html +++ b/_includes/components/posts-list.html @@ -12,7 +12,7 @@

- {{ post.data.title }} + {{ post.data.hero_banner.title }}

{% if post.data.excerpt %} diff --git a/_includes/components/reports-list.html b/_includes/components/reports-list.html index c35f9954..504f7399 100644 --- a/_includes/components/reports-list.html +++ b/_includes/components/reports-list.html @@ -1,28 +1,38 @@ -
-

- -
-
+ \ No newline at end of file diff --git a/_includes/components/side-nav.html b/_includes/components/side-nav.html index 53438fef..286f505d 100644 --- a/_includes/components/side-nav.html +++ b/_includes/components/side-nav.html @@ -1,12 +1,12 @@