Merge branch 'feature/new_nav' of https://github.com/getgrav/grav-plugin-admin into feature/new_nav

# Conflicts:
#	themes/grav/css-compiled/template.css
This commit is contained in:
Andy Miller
2016-03-07 18:27:42 -07:00
4 changed files with 8 additions and 4 deletions

View File

@@ -93,6 +93,11 @@ export default class MobileSidebar {
display: data.matches ? 'none' : 'inherit',
opacity: data.matches ? 0 : 1
});
if (data.matches) {
$('body').removeClass('sidebar-open sidebar-closed');
}
this[data.matches ? 'attach' : 'detach']();
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -412,7 +412,6 @@ $sidebar-padding: 2rem;
box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.1);
z-index: 2;
.lines-button {
display: none;
@extend %vertical-align;