Skip to content

Commit

Permalink
Merge pull request #167 from newrelic/tglaser/mobile-nav-tweaks
Browse files Browse the repository at this point in the history
styles: Mobile nav improvments
  • Loading branch information
jerelmiller authored Jun 17, 2020
2 parents 30e7b6c + ed89019 commit 81ba13f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
9 changes: 7 additions & 2 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import ExternalLink from './ExternalLink';
import styles from './Footer.module.scss';
import FeatherIcon from './FeatherIcon';
import Logo from './Logo';
import PropTypes from 'prop-types';

const Footer = () => (
<footer className={styles.footer}>
const Footer = ({ className }) => (
<footer className={cx(styles.footer, className)}>
<div className={cx('site-container', styles.container)}>
<div className={styles.left}>
<Link to="/">
Expand Down Expand Up @@ -36,4 +37,8 @@ const Footer = () => (
</footer>
);

Footer.propTypes = {
className: PropTypes.string,
};

export default Footer;
10 changes: 0 additions & 10 deletions src/components/GlobalHeader.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,3 @@
display: flex;
align-items: center;
}

// ==============================================================
// Responsive styles
// ==============================================================

@media screen and (max-width: 1240px) {
.globalHeaderContainer {
padding: 0 1.75rem;
}
}
3 changes: 2 additions & 1 deletion src/components/HamburgerMenu.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ button.hamburgerMenu {
background: none;
border: 0;
cursor: pointer;
width: 4rem;
width: 2rem;
outline: none;
padding: 0;

div {
width: 100%;
Expand Down
6 changes: 5 additions & 1 deletion src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ const Layout = ({ children }) => {
{children}
</main>
</div>
<Footer />
<Footer
className={cx({
[styles.hideOnMobile]: isMobileNavOpen,
})}
/>
</div>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/MobileHeader.module.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.container {
position: relative;
border-bottom: 1px solid var(--color-neutrals-100);
padding: 0 2rem;
}

.menuBar {
display: flex;
align-items: center;
justify-content: space-between;
height: var(--height-mobile-nav-bar);
padding: 0 1rem;
}

.logo {
Expand Down

0 comments on commit 81ba13f

Please sign in to comment.