diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 796cad2..e86ea5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Set node version - uses: actions/setup-node@v5 + uses: actions/setup-node@v6 with: node-version: 16.18.0 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f3844f6..0434b00 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Set node version - uses: actions/setup-node@v5 + uses: actions/setup-node@v6 with: node-version: 16.18.0 @@ -29,7 +29,7 @@ jobs: npx ng build --output-hashing=bundles - name: Deploy Main Site - uses: JamesIves/github-pages-deploy-action@v4.7.3 + uses: JamesIves/github-pages-deploy-action@v4.7.4 if: github.ref == 'refs/heads/main' with: branch: gh-pages diff --git a/package-lock.json b/package-lock.json index 38830e0..d0599a5 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 f07498d..ef769b7 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 6ee556f..14c83f0 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 8e0b572..07c30c0 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 @@
- +