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

# Conflicts:
#	themes/grav/css-compiled/template.css.map
This commit is contained in:
Djamil Legato
2016-05-10 10:30:42 -07:00
4 changed files with 42 additions and 18 deletions

View File

@@ -103,7 +103,6 @@ export default class Sidebar {
this.isOpen = false;
});
console.log(scrollbar);
if (scrollbar) { scrollbar.update(); }
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -17,7 +17,6 @@ $sidebar-padding: 2rem;
font-size: 0;
&:first-letter {
font-size: 2.5rem;
text-transform: uppercase;
}
}
@@ -88,6 +87,13 @@ $sidebar-padding: 2rem;
opacity: 1;
width: $sidebar-width-large;
h3 {
font-size: 1.2rem;
&:first-letter {
font-size: 1.2rem;
}
}
#grav-logo-small {
display: none;
}
@@ -105,12 +111,13 @@ $sidebar-padding: 2rem;
display: block;
}
.admin-logo {
.front-end {
display: inline-block;
}
.front-end {
display: inline-block;
}
#admin-menu {
em {
display: inline;
@@ -226,19 +233,22 @@ $sidebar-padding: 2rem;
margin-top: -5px;
}
}
}
.front-end {
@include breakpoint(mobile-only) {
position: absolute;
right: 20px;
top: 20px;
font-size: 36px;
padding-right: 0;
}
@include breakpoint(mini-nav-range) {
display: none;
.front-end {
@include breakpoint(mobile-only) {
position: absolute;
right: 20px;
top: 0;
line-height: 2rem;
padding-right: 0;
i {
font-size: 2rem;
}
}
@include breakpoint(mini-nav-range) {
display: none;
}
}
#grav-logo-small {
@@ -278,6 +288,21 @@ $sidebar-padding: 2rem;
text-align: center;
font-size: 1.2rem;
@include breakpoint(tablet-plus) {
font-size: 0;
&:first-letter {
font-size: 2.5rem;
}
}
@include breakpoint(large-desktop-plus) {
font-size: 1.2rem;
&:first-letter {
font-size: 1.2rem;
}
}
i {
font-size: 1rem;
vertical-align: middle;