Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-17 02:31:02 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
# Conflicts:
#	themes/grav/css-compiled/template.css.map
This commit is contained in:
Djamil Legato
2016-05-10 10:30:42 -07:00
parent 267a6ccdb1 856b991a5d
commit 462efc43cc
4 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
themes/grav/app/utils/sidebar.js
View File

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

2
themes/grav/css-compiled/template.css vendored
View File

File diff suppressed because one or more lines are too long

2
themes/grav/js/admin.min.js vendored
View File

File diff suppressed because one or more lines are too long

37
themes/grav/scss/template/_admin.scss
View File

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