Merge branch 'susy-3-upgrade'

Conflicts:
	_sass/minimal-mistakes/_page.scss
	docs/_sass/minimal-mistakes/_page.scss
This commit is contained in:
Michael Rose
2017-08-03 16:27:21 -04:00
156 changed files with 5354 additions and 8254 deletions

View File

@@ -12,13 +12,15 @@
z-index: 20;
&__inner-wrap {
@include container;
@include clearfix;
margin-left: auto;
margin-right: auto;
padding: 1em;
max-width: 100%;
display: -webkit-box;
display: flex;
-webkit-box-pack: justify;
justify-content: space-between;
padding: 1em 1em 1em;
justify-content: space-between;
font-family: $sans-serif-narrow;
@include breakpoint($x-large) {
@@ -47,7 +49,11 @@
}
.masthead__menu {
float: left;
margin-left: 0;
margin-right: 0;
width: 100%;
clear: both;
.site-nav {
margin-left: 0;