Skip to content

Update to cmei template #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kflemin merged 2 commits into from
Jan 14, 2026
Merged

Update to cmei template #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a8bc6
updated to cmei template
kflemin Jan 13, 2026
186f950
Merge branch 'develop' into update-template
nllong Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 12 additions & 0 deletions src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
134 changes: 72 additions & 62 deletions src/app/footer/footer.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="bpt">
<footer2 fxLayout="column" fxHide.xs>
<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>
<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>
<div fxLayout="row">
<section fxFlex="25">
<div>
<img src="assets/images/doe_eere_logo_footer.svg" alt="DOE EERE logo">
<img src="assets/images/cmei.svg" alt="DOE CMEI logo">
</div>
</section>
<section fxFlex="25">
Expand All @@ -14,7 +14,7 @@
</section>
<section fxFlex="25" fxLayout="column" fxLayoutAlign="center">
<div>
<img src="assets/images/nrel_logo_footer.svg" alt="NREL logo">
<img class="square" src="assets/images/nlr.webp" alt="NLR logo">
</div>
</section>
<section fxFlex="25" fxLayout="column" fxLayoutAlign="center">
Expand All @@ -24,9 +24,9 @@
</section>
</div>
<div fxLayout="row" class="descriptions">
<div fxFlex="25%">U.S. Department of Energy's Office of Energy Efficiency and Renewable Energy</div>
<div fxFlex="25%">U.S. Department of Energy's Office of Critical Minerals and Energy Innovation</div>
<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>
<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>
<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>
<div fxFlex="25%">Pacific Northwest National Laboratory (PNNL) is a national laboratory of the U.S. Department of Energy, operated by Battelle.</div>
</div>
</footer2>
Expand All @@ -47,8 +47,8 @@
</section>
<section>
<div>
<div fxFlex="20%" class="small-footer-img"><img src="assets/images/nrel_logo_footer.svg" alt="NREL logo"></div>
<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>
<div fxFlex="20%" class="small-footer-img"><img src="assets/images/nlr.webp" alt="NLR logo"></div>
<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>
</div>
</section>
<section>
Expand All @@ -60,70 +60,80 @@
</footer2>
</div>

<!-- eere footer -->
<!-- footer -->
<!--stopindex-->
<footer class="footer-site">
<div class="programbar" style="background-color: #666; color: #fff;">
"Building Data Tools is a resource of the U.S. Department of Energy's Building Technologies Office."<br>
<a href="mailto:[email protected]">Contact Us</a> | <a href="https://www.energy.gov/eere/buildings/building-technologies-office">Building Technologies Office</a>
<div class="programbar2" style="background-color: #E0E1E2; color: #fff;">
<div class="container footer-logo">
<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">
<img class="doe-cmei-logo" src="assets/images/cmei.svg" alt="U.S. Department of Energy - Office of Critical Materials and Energy Innovation">
</a>
</div>
</div>
<div class="footer-top">
<div class="container">
<div class="row">
<div class="col-md-3">
<p class="office">OFFICE of<br>
ENERGY EFFICIENCY AND RENEWABLE ENERGY</p>
<p>Forrestal Building<br>
1000 Independence Ave. SW<br>Washington DC 20585</p>

<div class="energy-social-widget">
<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>
<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>
<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>
<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>
<div class="footer-top tools-footer-top">
<div class="container">
<nav aria-label="Our Agency">
<div class="row">
<div class="col-md-3">
<div class="logo-tagline">
<img src="assets/images/DOE-horizontal-footer.svg" alt="Department of Energy">
</div>
</div>
<div class="col-md-3">
<p class="footer-header"><span class="menu-heading">Quick Links</span></p>
<p> <a href="https://www.energy.gov/our-leadership-offices">Leadership &amp; Offices</a></p>
<p><a href="https://www.energy.gov/mission">Mission</a></p>
<p><a href="https://www.energy.gov/topics/climate">Newsroom</a></p>
<p><a href="https://www.energy.gov/contact-us">Contact Us</a></p>
<p><a href="https://www.energy.gov/work-us-department-energy">Careers</a></p>
</div>
<div class="col-md-3">
<p class="footer-header"><span class="menu-heading">Resources</span>
</p>
<p><a href="https://www.energy.gov/budget-performance">Budget &amp; Performance </a></p>
<p><a href="https://www.directives.doe.gov/">Directives, Delegations, &amp; Requirements </a></p>
<p><a href="https://www.energy.gov/gc/freedom-information-act">Freedom of Information Act (FOIA)</a></p>
<p><a href="https://www.energy.gov/ig/office-inspector-general">Inspector General </a></p>
<p><a href="https://www.energy.gov/cio/privacy-program">Privacy Program</a></p>
</div>
<div class="col-md-3">
<p class="footer-header"><span class="menu-heading">Federal Government</span></p>
<p><a href="https://www.usa.gov/">USA.gov</a></p>
<p><a href="https://www.whitehouse.gov/">The White House </a></p>
</div>
<p class="small">An office of</p>
<a href="https://www.energy.gov/">
<img src="https://www.energy.gov/themes/particle/dist/app-drupal/assets/energy_white.png" alt="Energy.Gov" class="site-name">
</a>
</div>
<div class="col-md-3">
<p class="footer-header"><a href="https://www.energy.gov/eere/about-office-energy-efficiency-and-renewable-energy">About EERE</a></p>
<p><a href="https://www.energy.gov/careers/jobs">Careers and Internships</a></p>
<p><a href="https://www.energy.gov/eere/office-energy-efficiency-renewable-energy">EERE Home</a></p>
<p><a href="https://www1.eere.energy.gov/library/default.aspx">Publications Library</a></p>
<p><a href="https://www.energy.gov/eere/office-energy-efficiency-and-renewable-energy-contacts">Contact EERE</a></p>
</div>
<div class="col-md-3">
<p class="footer-header"><a href="https://www.energy.gov/">Energy.gov Resources</a></p>
<p><a href="https://www.energy.gov/budget-performance">Budget & Performance</a></p>
<p><a href="https://www.directives.doe.gov/">Directives, Delegations & Requirements</a></p>
<p><a href="https://www.energy.gov/management/freedom-information-act">FOIA</a></p>
<p><a href="https://www.energy.gov/ig/office-inspector-general">Inspector General</a></p>
<p><a href="https://www.energy.gov/cio/privacy-program">Privacy Program</a></p>
<p><a href="https://www.energy.gov/osdbu/office-small-and-disadvantaged-business-utilization">Small Business</a></p>
<p><a href="https://www.energy.gov/staff-and-contractors">Staff & Contractor Resources</a></p>
</div>
<div class="col-md-3">
<p class="footer-header"><a href="https://www.energy.gov/">Federal Government</a></p>
<p><a href="https://www.whitehouse.gov/">The White House</a></p>
<p><a href="https://www.usa.gov/">USA.gov</a></p>
</div>
</div>
</nav>
</div>
</div>

<div class="footer-bottom">
<div class="footer-bottom tools-footer-bottom">
<div class="container">
<ul class="menu">
<li><a href="https://www.energy.gov/about-us/web-policies">Web Policies</a></li>
<li><a href="https://www.energy.gov/about-us/web-policies/privacy">Privacy</a></li>
<li><a href="https://www.energy.gov/whistleblower-protection-and-nondisclosure-agreements">Whistleblower Protection</a></li>
<li><a href="https://www.energy.gov/cio/department-energy-information-quality-guidelines">Information Quality</a></li>
<li><a href="https://www.energy.gov/open-government">Open Gov</a></li>
<li><a href="https://www.energy.gov/cio/office-chief-information-officer/services/assistive-technology/accessibility-standard-statement">Accessibility</a></li>
<li><a href="https://doe.responsibledisclosure.com/hc/en-us">Vulnerability Disclosure Program</a></li>
</ul>
<nav aria-label="Utility Links">
<ul class="menu menu--menu-footer-utility nav">
<li class="first">
<a href="https://www.energy.gov/open-government">Open Gov</a>
</li>
<li>
<a href="https://www.energy.gov/cio/accessibility-standard-statement">Accessibility</a>
</li>
<li>
<a href="https://www.energy.gov/about-us/web-policies/privacy">Privacy</a>
</li>
<li>
<a href="https://www.energy.gov/cio/department-energy-information-quality-guidelines">Information Quality</a>
</li>
<li>
<a href="https://www.energy.gov/web-policies">Web Policies</a>
</li>
<li>
<a href="https://www.energy.gov/cio/articles/vulnerability-disclosure-policy">Vulnerability Disclosure Program</a>
</li>
<li>
<a href="https://www.energy.gov/whistleblower-protection-and-nondisclosure-agreements">Whistleblower Protection</a>
</li>
</ul>
</nav>
</div>
</div>

Expand Down
59 changes: 54 additions & 5 deletions src/app/footer/footer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,42 @@ footer2 {
background-color: $gray;
}

.container {
max-width: $maxWidth;
}

.menu-heading {
font-size: 20px;
font-weight: 700;
line-height: 1.4;
text-transform: none;
}

p {
font-size: 16px;
line-height: 1.65;
padding-bottom: 20px;
}

strong {
font-weight: 500;
padding: 14px $pad;
}

.program-bar2 {
text-align: left;
}

.footer-logo {
padding-top: 20px;
padding-bottom: 20px;
padding-left: 0px;
}

.doe-cmei-logo {
width: 410px;
}

.descriptions > div {
font-size: 11px;
padding: 14px $pad 8px;
Expand Down Expand Up @@ -36,6 +67,12 @@ section {
top: 0;
width: 100%;
}

.square {
height: 100%;
width: 50%;
margin-left: 50px;
}
}

&:not(:last-child) {
Expand Down Expand Up @@ -67,14 +104,22 @@ section {
footer {
padding-top: 30px;
background-color: white;
font-family: "Karla", sans-serif;
font-family: "Figtree", sans-serif;
}
.tools-footer-top {
background-color: #002959 !important;
background-image: unset;
border-bottom: 1px solid white;
}

.tools-footer-bottom {
background-color: #002959;
}
.footer-top .container {
width: 100%;

.row {
font-family: "Karla", sans-serif;
font-family: "Figtree", sans-serif;
font-size: 16px;
line-height: 1.65;
}
Expand All @@ -85,12 +130,16 @@ footer {
}

ul {
padding-left: 2rem;
padding-left: 3rem;
}

.nav > li {
padding-right: 30px;
}

ul.menu li a {
font-family: "Karla", sans-serif;
font-size: 12px;
font-family: "Figtree", sans-serif;
font-size: 16px;
padding-left: 5px;
padding-right: 5px;
}
Expand Down
21 changes: 13 additions & 8 deletions src/app/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@ <h1 routerLink="/" class="title">Building Performance Tools</h1>
<div class="container-fluid">
<!-- Header - no navigation-->
<div class="row">
<nav class="navbar navbar-inverse">
<nav class="navbar" style="border-bottom:1px solid #ccc;">
<div class="container">
<div class="navbar-header">
<div class="navbar-header" >
<div class="navbar-brand">
<span><img src="assets/images/doe-eere-logo.png" alt="" usemap="#logo" class="banner-logo">
<map name="logo">
<area shape="rect" class="focus" coords="1,1,198,20" href="https://www.energy.gov/" alt="Energy.gov">
<area shape="rect" class="focus" coords="2,22,198,75" href="https://www.energy.gov/eere/office-energy-efficiency-renewable-energy" alt="Office of Energy Efficiency and Renewable Energy">
</map>
<span>
<a href="https://www.energy.gov/cmei/office-critical-minerals-and-energy-innovation" alt="Office of Critical Minerals and Energy Innovation">
<img src="assets/images/cmei.svg" class="banner-logo">
</a>
</span>
<span class="banner-title"><a routerLink="/" class="focus">Building Data Tools</a></span>
</div>
</div>
</div>
</nav>
</div>
<div class="row">
<div class="container" style="border-bottom:1px solid #ccc;">
<div class="app-title">
<span class="banner-title"><a routerLink="/" class="focus">Building Data Tools</a></span>
</div>
</div>
</div>
</div>
</header>
<!-- end header -->
Expand Down
Loading