Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into develop

# Conflicts:
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
This commit is contained in:
Djamil Legato
2016-03-11 10:47:11 -08:00
3 changed files with 3 additions and 2 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -148,6 +148,7 @@ $sidebar-padding: 2rem;
#open-handle {
display: block;
position: absolute;
cursor: pointer;
right: -16px;
top: 20px;
width: 16px;