Skip to content

Commit

Permalink
feat: Spacing and sizing layout tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jerelmiller committed Jun 16, 2020
1 parent 57d1c15 commit 1f626d3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/components/Footer.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
background-color: var(--color-neutrals-800);
color: var(--footer-text-color);
padding: 1.5rem 0;
margin-top: 10rem;
}

.leftColumn {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import pages from '../data/sidenav.json';
import './styles.scss';

const Layout = ({ children }) => (
<>
<div className={styles.layout}>
<Header />
<div className={styles.layout}>
<div className={styles.main}>
<Sidebar pages={pages} />
<main>{children}</main>
<main className={styles.content}>{children}</main>
</div>
<Footer pages={pages} />
</>
</div>
);

Layout.propTypes = {
Expand Down
12 changes: 10 additions & 2 deletions src/components/Layout.module.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
.layout {
min-height: 100vh;
display: grid;
grid-template-rows: auto 1fr auto;
}

.main {
display: grid;
grid-template-columns: auto minmax(0, 1fr);
grid-gap: 1rem;
max-width: 1200px;
max-width: 1460px;
margin: 0 auto;
}

.content {
padding: 2rem;
}
2 changes: 1 addition & 1 deletion src/components/Sidebar.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.sidebar {
padding: 2rem 0;
padding: 2rem;
border-right: 1px solid var(--color-neutrals-100);

ul {
Expand Down

0 comments on commit 1f626d3

Please sign in to comment.