diff --git a/src/_sass/_components/_navigation.scss b/src/_sass/_components/_navigation.scss new file mode 100644 index 0000000..150f541 --- /dev/null +++ b/src/_sass/_components/_navigation.scss @@ -0,0 +1,27 @@ +@import '_helpers/variables'; +@import '_helpers/mixins'; + +nav { + align-items: center; + display: flex; + flex-direction: column; + + &.navbar-default { + background-color: $white; + border-color: $white; + } + + @include breakpoint(small) { + flex-flow: row nowrap; + justify-content: space-around; + + &.navbar { + margin: 0; + } + + .navbar-toggle { + margin-left: auto; + margin-right: 0; + } + } +} diff --git a/src/_sass/_helpers/_mixins.scss b/src/_sass/_helpers/_mixins.scss new file mode 100644 index 0000000..194ed5d --- /dev/null +++ b/src/_sass/_helpers/_mixins.scss @@ -0,0 +1,12 @@ +// **** Responsive Breakpoints **** // +@mixin breakpoint($point) { + @if $point == large { + @media (max-width: 64.375em) { @content; } + } + @else if $point == medium { + @media (max-width: 50em) { @content; } + } + @else if $point == small { + @media (max-width: 37.5em) { @content; } + } +} diff --git a/src/_sass/_helpers/_variables.scss b/src/_sass/_helpers/_variables.scss new file mode 100644 index 0000000..0b6835a --- /dev/null +++ b/src/_sass/_helpers/_variables.scss @@ -0,0 +1,7 @@ +@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:400,700'); + +// **** Fonts **** // +$font-family: 'Josefin Sans', sans-serif; + +// **** Colours **** // +$white: white; diff --git a/src/_sass/background.scss b/src/_sass/background.scss index 25fa51c..229f89c 100644 --- a/src/_sass/background.scss +++ b/src/_sass/background.scss @@ -1,2 +1,14 @@ +@import '_helpers/variables'; +@import '_components/navigation'; + body { + font-family: $font-family; +} + +h1, +h2, +h3, +h4, +h5 { + font-size: 700; } diff --git a/webpack/components/Layout.jsx b/webpack/components/Layout.jsx index 0e12013..43036c4 100644 --- a/webpack/components/Layout.jsx +++ b/webpack/components/Layout.jsx @@ -13,14 +13,10 @@ export default class Layout extends React.Component { render() { return (
-
); diff --git a/webpack/components/Nav.jsx b/webpack/components/Nav.jsx index 6577703..a122501 100644 --- a/webpack/components/Nav.jsx +++ b/webpack/components/Nav.jsx @@ -13,12 +13,12 @@ export default class Nav extends React.Component { }); return ( -