Skip to content

Commit

Permalink
Merge branch 'main' into bug/google-maps-perf
Browse files Browse the repository at this point in the history
  • Loading branch information
bstopp authored Nov 30, 2023
2 parents c6e7e61 + 684dbcd commit 7564542
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 10 deletions.
4 changes: 2 additions & 2 deletions blocks/footer/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ footer {
margin-right: 10px;
}

.icon-facebook svg, .icon-linkedin svg, .icon-instagram svg, .icon-youtube svg {
.icon-facebook img, .icon-linkedin img, .icon-instagram img, .icon-youtube img {
height: 20px;
width: 20px;
margin-right: 5px;
opacity: .4;
}


.footer-container-flex > div:nth-child(1) svg {
.footer-container-flex > div:nth-child(1) img {
position: relative;
height: 68px;
width: 68px;
Expand Down
15 changes: 13 additions & 2 deletions blocks/header/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ body.light-nav {
font-family: var(--font-family-proxima);
font-weight: var(--font-weight-normal);
font-size: var(--body-font-size-s);
letter-spacing:var(--letter-spacing-reg);
letter-spacing: var(--letter-spacing-reg);
line-height: var(--body-font-size-s);
text-decoration: none;
cursor: pointer;
Expand Down Expand Up @@ -197,6 +197,7 @@ body.light-nav {
}

.header.block nav .nav-hamburger .nav-hamburger-icon {
position: relative;
height: 24px;
width: 24px;
}
Expand All @@ -208,9 +209,19 @@ body.light-nav {

.header.block nav .nav-hamburger .close {
display: none;
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
}

.header.block nav .nav-hamburger .open {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
filter: var(--hamburger-filter);
}

Expand Down Expand Up @@ -239,7 +250,7 @@ body.light-nav {
height: var(--nav-height);
background: transparent;
}

body.light-nav .header.block nav[aria-expanded="true"] {
--logo-filter: invert(1);
}
Expand Down
6 changes: 4 additions & 2 deletions blocks/header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { BREAKPOINTS } from '../../scripts/scripts.js';
import { getMetadata, decorateIcons, decorateSections } from '../../scripts/aem.js';

// media query match that indicates mobile/tablet width
const isDesktop = BREAKPOINTS.medium;
const isDesktop = BREAKPOINTS.large;

function closeOnEscape(e) {
if (e.code === 'Escape') {
Expand Down Expand Up @@ -230,7 +230,9 @@ export default async function decorate(block) {
nav.setAttribute('aria-expanded', 'false');
// prevent mobile nav behavior on window resize
toggleMenu(nav, navSections, isDesktop.matches);
isDesktop.addEventListener('change', () => toggleMenu(nav, navSections, isDesktop.matches));
isDesktop.addEventListener('change', () => {
toggleMenu(nav, navSections, isDesktop.matches);
});

decorateIcons(nav);
const navWrapper = document.createElement('div');
Expand Down
5 changes: 4 additions & 1 deletion icons/bhhs_seal_blk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions icons/heartempty.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions icons/saved-properties.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ async function loadLazy(doc) {

loadCSS(`${window.hlx.codeBasePath}/styles/lazy-styles.css`);
loadFonts();
addFavIcon(`${window.hlx.codeBasePath}/styles/favicon.svg`);
addFavIcon(`${window.hlx.codeBasePath}/styles/bhhs_seal_favicon.ico`);
sampleRUM('lazy');
sampleRUM.observe(main.querySelectorAll('div[data-block-name]'));
sampleRUM.observe(main.querySelectorAll('picture > img'));
Expand Down
Binary file added styles/bhhs_seal_favicon.ico
Binary file not shown.

0 comments on commit 7564542

Please sign in to comment.