Skip to content

Commit

Permalink
Fix Nav Alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
austinkettner committed Apr 28, 2018
1 parent ee4bbcf commit 371dc5d
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/components/public/floating-footer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import Github from 'static/ic_github.svg';
const FloatingFooter = () => (
<div className={styles.footer}>
<div className={`container container--full ${styles.container}`}>
<a className={styles.wonderkiln} target="_blank" href="https://wonderkiln.com">
<a className={styles.wonderkiln} target="_blank" href="https://www.wonderkiln.com">
A Wonderkiln Project
</a>
<a href="https://github.com/CameraKit/camerakit-android">
<img className={styles.icon} src={Github} />
<span className={styles.github}>Github</span>
<img className={styles.icon} src={Github} alt="github icon" />
<span className={styles.github}>Github</span>
</a>
</div>
</div>
Expand Down
12 changes: 8 additions & 4 deletions src/components/public/nav/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ import Menu from './ic_menu.svg';
const Nav = () => (
<nav className={styles.nav}>
<div className={`container container--full ${styles.container}`}>
<Logo />
<LogoType />
<div>
{/*<Menu />*/}
<div className={styles.Logo}>
<Logo />
</div>
<div className={styles.Brand}>
<LogoType />
</div>
<div className={styles.Menu}>
<Menu />
</div>
</div>
</nav>
Expand Down
15 changes: 15 additions & 0 deletions src/components/public/nav/nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@
display: flex;
align-items: center;
justify-content: space-between;
.Logo {
flex-basis: 30%;
display: flex;
justify-content: flex-start;
}
.Brand {
flex-basis: 30%;
display: flex;
justify-content: center;
}
.Menu {
flex-basis: 30%;
display: flex;
justify-content: flex-end;
}
}

@media (min-width: 34em) {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/public/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ import styles from './home.scss';
import featureStyles from './features.scss';
import intro from './intro.scss';

function scrollDown () {
function scrollDown() {
jump('#features');
}

const Home = () => (
<div>
<FloatingFooter />
<section className={intro.intro}>
<div className='container container--large'>
<div className="container container--large">
<div className={intro.content}>
<div className={intro.phone} />
<div className={intro.hidden}>
Expand Down

0 comments on commit 371dc5d

Please sign in to comment.