From 47a8bc61f13db2016d5266e8e8cbc6ff21fad5f4 Mon Sep 17 00:00:00 2001 From: kflemin <2205659+kflemin@users.noreply.github.com> Date: Tue, 13 Jan 2026 13:56:40 -0700 Subject: [PATCH 1/2] updated to cmei template --- package-lock.json | 15 + package.json | 1 + src/app/app.component.scss | 12 + src/app/footer/footer.component.html | 134 +- src/app/footer/footer.component.scss | 59 +- src/app/header/header.component.html | 21 +- src/app/header/header.component.scss | 38 +- src/app/home/graphic/graphic.component.scss | 2 +- src/app/home/home.component.scss | 4 +- src/app/menu/menu.component.scss | 2 +- src/assets/css/app.css | 2 +- src/assets/images/DOE-horizontal-footer.svg | 346 ++++ src/assets/images/cmei.svg | 1594 +++++++++++++++++++ src/assets/images/nlr.webp | Bin 0 -> 16430 bytes src/styles.scss | 3 +- src/styles/_theme.scss | 2 +- 16 files changed, 2149 insertions(+), 86 deletions(-) create mode 100644 src/assets/images/DOE-horizontal-footer.svg create mode 100644 src/assets/images/cmei.svg create mode 100644 src/assets/images/nlr.webp diff --git a/package-lock.json b/package-lock.json index 38830e08..d0599a5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@angular/platform-browser": "^14.2.0", "@angular/platform-browser-dynamic": "^14.2.0", "@angular/router": "^14.2.0", + "@fontsource/figtree": "^5.2.8", "@fontsource/karla": "^4.5.10", "@fontsource/material-icons": "^4.5.4", "@fontsource/roboto": "^4.5.8", @@ -2792,6 +2793,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@fontsource/figtree": { + "version": "5.2.10", + "resolved": "https://registry.npmjs.org/@fontsource/figtree/-/figtree-5.2.10.tgz", + "integrity": "sha512-nlO06N1qad88ySqzi/a2xwDBkamfZ4MFilP8la5dDyRY36ED0UYTs2hhtwJf8fM52+Nn7dQO2r27reKaXOyOIg==", + "license": "OFL-1.1", + "funding": { + "url": "https://github.com/sponsors/ayuhito" + } + }, "node_modules/@fontsource/karla": { "version": "4.5.10", "resolved": "https://registry.npmjs.org/@fontsource/karla/-/karla-4.5.10.tgz", @@ -15020,6 +15030,11 @@ } } }, + "@fontsource/figtree": { + "version": "5.2.10", + "resolved": "https://registry.npmjs.org/@fontsource/figtree/-/figtree-5.2.10.tgz", + "integrity": "sha512-nlO06N1qad88ySqzi/a2xwDBkamfZ4MFilP8la5dDyRY36ED0UYTs2hhtwJf8fM52+Nn7dQO2r27reKaXOyOIg==" + }, "@fontsource/karla": { "version": "4.5.10", "resolved": "https://registry.npmjs.org/@fontsource/karla/-/karla-4.5.10.tgz", diff --git a/package.json b/package.json index f07498df..ef769b79 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@angular/router": "^14.2.0", "@fontsource/karla": "^4.5.10", "@fontsource/material-icons": "^4.5.4", + "@fontsource/figtree": "^5.2.8", "@fontsource/roboto": "^4.5.8", "@fontsource/roboto-condensed": "^4.5.9", "@fortawesome/fontawesome-free": "^6.2.0", diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 6ee556f0..14c83f0e 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,5 +1,17 @@ @import "theme"; +html { + font-family: 'Figtree', sans-serif; +} + +body { + font-family: 'Figtree', sans-serif; +} + +.mat-body, .mat-body-1, .mat-typography .mat-body, .mat-typography .mat-body-1, .mat-typography { + font-family: 'Figtree', sans-serif !important; +} + *:focus { outline: 2px solid #005FCC; } diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 8e0b572d..07c30c06 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -1,10 +1,10 @@
- Driving Building Energy Performance with Data was developed to showcase tools and methods developed by Lawrence Berkeley National Laboratory, National Renewable Energy Laboratory, and Pacific Northwest National Laboratory with support from the U.S. Department of Energy's Building Technologies Office. + Driving Building Energy Performance with Data was developed to showcase tools and methods developed by Lawrence Berkeley National Laboratory, National Laboratory of the Rockies, and Pacific Northwest National Laboratory with support from the U.S. Department of Energy's Building Technologies Office.
- DOE EERE logo + DOE CMEI logo
@@ -14,7 +14,7 @@
- NREL logo + NLR logo
@@ -24,9 +24,9 @@
-
U.S. Department of Energy's Office of Energy Efficiency and Renewable Energy
+
U.S. Department of Energy's Office of Critical Minerals and Energy Innovation
Lawrence Berkeley National Laboratory (LBNL) is a national laboratory of the U.S. Department of Energy, operated by the University of California.
-
The National Renewable Energy Laboratory (NREL) is a national laboratory of the U.S. Department of Energy, Office of Energy Efficiency and Renewable Energy, operated by the Alliance for Sustainable Energy, LLC
+
The National Laboratory of the Rockies (NLR) is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation, operated by the Alliance for Energy Innovation, LLC
Pacific Northwest National Laboratory (PNNL) is a national laboratory of the U.S. Department of Energy, operated by Battelle.
 @@ -47,8 +47,8 @@
-
NREL logo
-
The National Renewable Energy Laboratory (NREL) is a national laboratory of the U.S. Department of Energy, Office of Energy Efficiency and Renewable Energy, operated by the Alliance for Sustainable Energy, LLC
+
NLR logo
+
The National Laboratory of the Rockies (NLR) is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation, operated by the Alliance for Energy Innovation, LLC.
@@ -60,70 +60,80 @@
- +