Skip to content

Commit c8c178e

Browse files
kfleminkflemin
authored
Merge pull request #124 from BuildingEnergyTools/develop
Deploy template update
2 parents 0adf7f4 + d5422b3 commit c8c178e

18 files changed

Lines changed: 2154 additions & 91 deletions

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout 🛎️
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313

1414
- name: Set node version
15-
uses: actions/setup-node@v5
15+
uses: actions/setup-node@v6
1616
with:
1717
node-version: 16.18.0
1818

‎.github/workflows/deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout 🛎️
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

1919
- name: Set node version
20-
uses: actions/setup-node@v5
20+
uses: actions/setup-node@v6
2121
with:
2222
node-version: 16.18.0
2323

@@ -29,7 +29,7 @@ jobs:
2929
npx ng build --output-hashing=bundles
3030
3131
- name: Deploy Main Site
32-
uses: JamesIves/github-pages-deploy-action@v4.7.3
32+
uses: JamesIves/github-pages-deploy-action@v4.7.4
3333
if: github.ref == 'refs/heads/main'
3434
with:
3535
branch: gh-pages

‎package-lock.json‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"@angular/router": "^14.2.0",
2424
"@fontsource/karla": "^4.5.10",
2525
"@fontsource/material-icons": "^4.5.4",
26+
"@fontsource/figtree": "^5.2.8",
2627
"@fontsource/roboto": "^4.5.8",
2728
"@fontsource/roboto-condensed": "^4.5.9",
2829
"@fortawesome/fontawesome-free": "^6.2.0",

‎src/app/app.component.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
@import "theme";
22

3+
html {
4+
font-family: 'Figtree', sans-serif;
5+
}
6+
7+
body {
8+
font-family: 'Figtree', sans-serif;
9+
}
10+
11+
.mat-body, .mat-body-1, .mat-typography .mat-body, .mat-typography .mat-body-1, .mat-typography {
12+
font-family: 'Figtree', sans-serif !important;
13+
}
14+
315
*:focus {
416
outline: 2px solid #005FCC;
517
}

‎src/app/footer/footer.component.html‎

Lines changed: 72 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="bpt">
22
<footer2 fxLayout="column" fxHide.xs>
3-
<strong>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.</strong>
3+
<strong>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.</strong>
44
<div fxLayout="row">
55
<section fxFlex="25">
66
<div>
7-
<img src="assets/images/doe_eere_logo_footer.svg" alt="DOE EERE logo">
7+
<img src="assets/images/cmei.svg" alt="DOE CMEI logo">
88
</div>
99
</section>
1010
<section fxFlex="25">
@@ -14,7 +14,7 @@
1414
</section>
1515
<section fxFlex="25" fxLayout="column" fxLayoutAlign="center">
1616
<div>
17-
<img src="assets/images/nrel_logo_footer.svg" alt="NREL logo">
17+
<img class="square" src="assets/images/nlr.webp" alt="NLR logo">
1818
</div>
1919
</section>
2020
<section fxFlex="25" fxLayout="column" fxLayoutAlign="center">
@@ -24,9 +24,9 @@
2424
</section>
2525
</div>
2626
<div fxLayout="row" class="descriptions">
27-
<div fxFlex="25%">U.S. Department of Energy's Office of Energy Efficiency and Renewable Energy</div>
27+
<div fxFlex="25%">U.S. Department of Energy's Office of Critical Minerals and Energy Innovation</div>
2828
<div fxFlex="25%">Lawrence Berkeley National Laboratory (LBNL) is a national laboratory of the U.S. Department of Energy, operated by the University of California.</div>
29-
<div fxFlex="25%">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</div>
29+
<div fxFlex="25%">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</div>
3030
<div fxFlex="25%">Pacific Northwest National Laboratory (PNNL) is a national laboratory of the U.S. Department of Energy, operated by Battelle.</div>
3131
</div>
3232
</footer2>
@@ -47,8 +47,8 @@
4747
</section>
4848
<section>
4949
<div>
50-
<div fxFlex="20%" class="small-footer-img"><img src="assets/images/nrel_logo_footer.svg" alt="NREL logo"></div>
51-
<div>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</div>
50+
<div fxFlex="20%" class="small-footer-img"><img src="assets/images/nlr.webp" alt="NLR logo"></div>
51+
<div>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.</div>
5252
</div>
5353
</section>
5454
<section>
@@ -60,70 +60,80 @@
6060
</footer2>
6161
</div>
6262

63-
<!-- eere footer -->
63+
<!-- footer -->
6464
<!--stopindex-->
6565
<footer class="footer-site">
66-
<div class="programbar" style="background-color: #666; color: #fff;">
67-
"Building Data Tools is a resource of the U.S. Department of Energy's Building Technologies Office."<br>
68-
<a href="mailto:BTODataTools@ee.doe.gov">Contact Us</a> | <a href="https://www.energy.gov/eere/buildings/building-technologies-office">Building Technologies Office</a>
66+
<div class="programbar2" style="background-color: #E0E1E2; color: #fff;">
67+
<div class="container footer-logo">
68+
<a href="https://www.energy.gov/cmei/office-critical-minerals-and-energy-innovation" title="U.S. Department of Energy - Office of Critical Materials and Energy Innovation" class="display-flex">
69+
<img class="doe-cmei-logo" src="assets/images/cmei.svg" alt="U.S. Department of Energy - Office of Critical Materials and Energy Innovation">
70+
</a>
71+
</div>
6972
</div>
70-
<div class="footer-top">
71-
<div class="container">
72-
<div class="row">
73-
<div class="col-md-3">
74-
<p class="office">OFFICE of<br>
75-
ENERGY EFFICIENCY AND RENEWABLE ENERGY</p>
76-
<p>Forrestal Building<br>
77-
1000 Independence Ave. SW<br>Washington DC 20585</p>
7873

79-
<div class="energy-social-widget">
80-
<a href="https://www.facebook.com/eeregov" aria-label="Link to Facebook" title="Link to Facebook"><i class="fab fa-facebook-f fa-lg circle-icon"></i><span class="sr-only">Link to Facebook</span></a>
81-
<a href="https://twitter.com/eeregov" aria-label="Link to Twitter" title="Link to Twitter"><i class="fab fa-twitter fa-lg circle-icon"></i><span class="sr-only">Link to Twitter</span></a>
82-
<a href="https://www.youtube.com/user/USdepartmentofenergy" aria-label="Link to Youtube" title="Link to Youtube"><i class="fab fa-youtube fa-lg circle-icon"></i><span class="sr-only">Link to Youtube</span></a>
83-
<a href="https://www.linkedin.com/showcase/10310263/" aria-label="Link to Linkedin" title="Link to Linkedin"><i class="fab fa-linkedin-in fa-lg circle-icon"></i><span class="sr-only">Link to Linkedin</span></a>
74+
<div class="footer-top tools-footer-top">
75+
<div class="container">
76+
<nav aria-label="Our Agency">
77+
<div class="row">
78+
<div class="col-md-3">
79+
<div class="logo-tagline">
80+
<img src="assets/images/DOE-horizontal-footer.svg" alt="Department of Energy">
81+
</div>
82+
</div>
83+
<div class="col-md-3">
84+
<p class="footer-header"><span class="menu-heading">Quick Links</span></p>
85+
<p> <a href="https://www.energy.gov/our-leadership-offices">Leadership &amp; Offices</a></p>
86+
<p><a href="https://www.energy.gov/mission">Mission</a></p>
87+
<p><a href="https://www.energy.gov/topics/climate">Newsroom</a></p>
88+
<p><a href="https://www.energy.gov/contact-us">Contact Us</a></p>
89+
<p><a href="https://www.energy.gov/work-us-department-energy">Careers</a></p>
90+
</div>
91+
<div class="col-md-3">
92+
<p class="footer-header"><span class="menu-heading">Resources</span>
93+
</p>
94+
<p><a href="https://www.energy.gov/budget-performance">Budget &amp; Performance </a></p>
95+
<p><a href="https://www.directives.doe.gov/">Directives, Delegations, &amp; Requirements </a></p>
96+
<p><a href="https://www.energy.gov/gc/freedom-information-act">Freedom of Information Act (FOIA)</a></p>
97+
<p><a href="https://www.energy.gov/ig/office-inspector-general">Inspector General </a></p>
98+
<p><a href="https://www.energy.gov/cio/privacy-program">Privacy Program</a></p>
99+
</div>
100+
<div class="col-md-3">
101+
<p class="footer-header"><span class="menu-heading">Federal Government</span></p>
102+
<p><a href="https://www.usa.gov/">USA.gov</a></p>
103+
<p><a href="https://www.whitehouse.gov/">The White House </a></p>
84104
</div>
85-
<p class="small">An office of</p>
86-
<a href="https://www.energy.gov/">
87-
<img src="https://www.energy.gov/themes/particle/dist/app-drupal/assets/energy_white.png" alt="Energy.Gov" class="site-name">
88-
</a>
89-
</div>
90-
<div class="col-md-3">
91-
<p class="footer-header"><a href="https://www.energy.gov/eere/about-office-energy-efficiency-and-renewable-energy">About EERE</a></p>
92-
<p><a href="https://www.energy.gov/careers/jobs">Careers and Internships</a></p>
93-
<p><a href="https://www.energy.gov/eere/office-energy-efficiency-renewable-energy">EERE Home</a></p>
94-
<p><a href="https://www1.eere.energy.gov/library/default.aspx">Publications Library</a></p>
95-
<p><a href="https://www.energy.gov/eere/office-energy-efficiency-and-renewable-energy-contacts">Contact EERE</a></p>
96-
</div>
97-
<div class="col-md-3">
98-
<p class="footer-header"><a href="https://www.energy.gov/">Energy.gov Resources</a></p>
99-
<p><a href="https://www.energy.gov/budget-performance">Budget & Performance</a></p>
100-
<p><a href="https://www.directives.doe.gov/">Directives, Delegations & Requirements</a></p>
101-
<p><a href="https://www.energy.gov/management/freedom-information-act">FOIA</a></p>
102-
<p><a href="https://www.energy.gov/ig/office-inspector-general">Inspector General</a></p>
103-
<p><a href="https://www.energy.gov/cio/privacy-program">Privacy Program</a></p>
104-
<p><a href="https://www.energy.gov/osdbu/office-small-and-disadvantaged-business-utilization">Small Business</a></p>
105-
<p><a href="https://www.energy.gov/staff-and-contractors">Staff & Contractor Resources</a></p>
106-
</div>
107-
<div class="col-md-3">
108-
<p class="footer-header"><a href="https://www.energy.gov/">Federal Government</a></p>
109-
<p><a href="https://www.whitehouse.gov/">The White House</a></p>
110-
<p><a href="https://www.usa.gov/">USA.gov</a></p>
111105
</div>
112-
</div>
106+
</nav>
113107
</div>
114108
</div>
115-
116-
<div class="footer-bottom">
109+
110+
<div class="footer-bottom tools-footer-bottom">
117111
<div class="container">
118-
<ul class="menu">
119-
<li><a href="https://www.energy.gov/about-us/web-policies">Web Policies</a></li>
120-
<li><a href="https://www.energy.gov/about-us/web-policies/privacy">Privacy</a></li>
121-
<li><a href="https://www.energy.gov/whistleblower-protection-and-nondisclosure-agreements">Whistleblower Protection</a></li>
122-
<li><a href="https://www.energy.gov/cio/department-energy-information-quality-guidelines">Information Quality</a></li>
123-
<li><a href="https://www.energy.gov/open-government">Open Gov</a></li>
124-
<li><a href="https://www.energy.gov/cio/office-chief-information-officer/services/assistive-technology/accessibility-standard-statement">Accessibility</a></li>
125-
<li><a href="https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a></li>
126-
</ul>
112+
<nav aria-label="Utility Links">
113+
<ul class="menu menu--menu-footer-utility nav">
114+
<li class="first">
115+
<a href="https://www.energy.gov/open-government">Open Gov</a>
116+
</li>
117+
<li>
118+
<a href="https://www.energy.gov/cio/accessibility-standard-statement">Accessibility</a>
119+
</li>
120+
<li>
121+
<a href="https://www.energy.gov/about-us/web-policies/privacy">Privacy</a>
122+
</li>
123+
<li>
124+
<a href="https://www.energy.gov/cio/department-energy-information-quality-guidelines">Information Quality</a>
125+
</li>
126+
<li>
127+
<a href="https://www.energy.gov/web-policies">Web Policies</a>
128+
</li>
129+
<li>
130+
<a href="https://www.energy.gov/cio/articles/vulnerability-disclosure-policy">Vulnerability Disclosure Program</a>
131+
</li>
132+
<li>
133+
<a href="https://www.energy.gov/whistleblower-protection-and-nondisclosure-agreements">Whistleblower Protection</a>
134+
</li>
135+
</ul>
136+
</nav>
127137
</div>
128138
</div>
129139

‎src/app/footer/footer.component.scss‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,42 @@ footer2 {
44
background-color: $gray;
55
}
66

7+
.container {
8+
max-width: $maxWidth;
9+
}
10+
11+
.menu-heading {
12+
font-size: 20px;
13+
font-weight: 700;
14+
line-height: 1.4;
15+
text-transform: none;
16+
}
17+
18+
p {
19+
font-size: 16px;
20+
line-height: 1.65;
21+
padding-bottom: 20px;
22+
}
23+
724
strong {
825
font-weight: 500;
926
padding: 14px $pad;
1027
}
1128

29+
.program-bar2 {
30+
text-align: left;
31+
}
32+
33+
.footer-logo {
34+
padding-top: 20px;
35+
padding-bottom: 20px;
36+
padding-left: 0px;
37+
}
38+
39+
.doe-cmei-logo {
40+
width: 410px;
41+
}
42+
1243
.descriptions > div {
1344
font-size: 11px;
1445
padding: 14px $pad 8px;
@@ -36,6 +67,12 @@ section {
3667
top: 0;
3768
width: 100%;
3869
}
70+
71+
.square {
72+
height: 100%;
73+
width: 50%;
74+
margin-left: 50px;
75+
}
3976
}
4077

4178
&:not(:last-child) {
@@ -67,14 +104,22 @@ section {
67104
footer {
68105
padding-top: 30px;
69106
background-color: white;
70-
font-family: "Karla", sans-serif;
107+
font-family: "Figtree", sans-serif;
108+
}
109+
.tools-footer-top {
110+
background-color: #002959 !important;
111+
background-image: unset;
112+
border-bottom: 1px solid white;
71113
}
72114

115+
.tools-footer-bottom {
116+
background-color: #002959;
117+
}
73118
.footer-top .container {
74119
width: 100%;
75120

76121
.row {
77-
font-family: "Karla", sans-serif;
122+
font-family: "Figtree", sans-serif;
78123
font-size: 16px;
79124
line-height: 1.65;
80125
}
@@ -85,12 +130,16 @@ footer {
85130
}
86131

87132
ul {
88-
padding-left: 2rem;
133+
padding-left: 3rem;
134+
}
135+
136+
.nav > li {
137+
padding-right: 30px;
89138
}
90139

91140
ul.menu li a {
92-
font-family: "Karla", sans-serif;
93-
font-size: 12px;
141+
font-family: "Figtree", sans-serif;
142+
font-size: 16px;
94143
padding-left: 5px;
95144
padding-right: 5px;
96145
}

0 commit comments

Comments
 (0)