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

various fixes

Browse Source
This commit is contained in:
Andy Miller
2016-03-07 16:09:44 -07:00
parent 1a7acb2692
commit 04c90e8bf6
4 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

4
themes/grav/scss/nucleus/mixins/_breakpoints.scss
View File

@@ -13,6 +13,9 @@
@else if $breakpoint == large-mobile-range { @else if $breakpoint == large-mobile-range {
@media only #{$media} and (min-width: $large-mobile-container + 0.063) and (max-width: $tablet-container - 0.062) { @content; } @media only #{$media} and (min-width: $large-mobile-container + 0.063) and (max-width: $tablet-container - 0.062) { @content; }
} }
@else if $breakpoint == mini-nav-range {
@media only #{$media} and (min-width: $tablet-container - 0.062) and (max-width: $large-desktop-container - 0.062) { @content; }
}
@else if $breakpoint == small-mobile-range { @else if $breakpoint == small-mobile-range {
@media only #{$media} and (max-width: $large-mobile-container) { @content; } @media only #{$media} and (max-width: $large-mobile-container) { @content; }
} }
@@ -38,5 +41,4 @@
@media only #{$media} and (min-width: $large-desktop-container - 0.062) { @content; } @media only #{$media} and (min-width: $large-desktop-container - 0.062) { @content; }
} }
} }
} }

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

@@ -66,8 +66,26 @@ $sidebar-padding: 2rem;
} }
} }
#admin-menu em { #admin-menu {
display: inline; em {
display: inline;
}
li {
.badges {
.updates {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
position: relative;
top: auto;
right: auto;
@extend .badge;
}
.count {
display: inline-block;
}
}
}
} }
} }
} }
@@ -96,13 +114,9 @@ $sidebar-padding: 2rem;
} }
.front-end { .front-end {
@include breakpoint(tablet-plus) { @include breakpoint(mini-nav-range) {
display: none; display: none;
} }
@include breakpoint(large-desktop-plus) {
display: inline-block;
}
} }
} }
@@ -156,16 +170,11 @@ $sidebar-padding: 2rem;
overflow: hidden; overflow: hidden;
text-align: left; text-align: left;
@include breakpoint(tablet-plus) { @include breakpoint(mini-nav-range) {
padding: 12px; padding: 12px;
text-align: center; text-align: center;
} }
@include breakpoint(large-desktop-plus) {
padding: $sidebar-padding;
text-align: left;
}
img { img {
@include transition(all 0.5s ease); @include transition(all 0.5s ease);
border-radius: 100%; border-radius: 100%;
@@ -177,15 +186,10 @@ $sidebar-padding: 2rem;
margin-top: 5px; margin-top: 5px;
display: block; display: block;
@include breakpoint(tablet-plus) { @include breakpoint(mini-nav-range) {
display: none; display: none;
} }
@include breakpoint(large-desktop-plus) {
display: block;
}
h4, h5 { h4, h5 {
margin: 0; margin: 0;
font-size: 1rem; font-size: 1rem;
@@ -208,13 +212,9 @@ $sidebar-padding: 2rem;
em { em {
font-style: normal; font-style: normal;
@include breakpoint(tablet-plus) { @include breakpoint(mini-nav-range) {
display: none; display: none;
} }
@include breakpoint(large-desktop-plus) {
display: inline;
}
} }
li { li {
@@ -222,6 +222,7 @@ $sidebar-padding: 2rem;
float: right; float: right;
margin-right:1rem; margin-right:1rem;
.badge { .badge {
display: inline-block; display: inline-block;
margin-right: -5px; margin-right: -5px;
@@ -231,6 +232,12 @@ $sidebar-padding: 2rem;
display: none; display: none;
} }
.count {
@include breakpoint(mini-nav-range) {
display: none;
}
}
&.with-updates { &.with-updates {
.count { .count {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
@@ -240,8 +247,18 @@ $sidebar-padding: 2rem;
.updates { .updates {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
display: inline-block; display: inline-block;
@include breakpoint(mini-nav-range) {
border-radius: 100%;
position: absolute;
top: 4px;
right: 10px;
font-size: 9px;
line-height: 12px;
padding: 1px 3px;
min-width: 15px;
}
} }
} }
} }
@@ -252,6 +269,7 @@ $sidebar-padding: 2rem;
padding-left: 25px; padding-left: 25px;
padding-top: 0.7rem; padding-top: 0.7rem;
padding-bottom: 0.7rem; padding-bottom: 0.7rem;
position: relative;
.fa { .fa {
@include transition(all 0.2s ease); @include transition(all 0.2s ease);

25
themes/grav/templates/partials/nav.html.twig
View File

@@ -29,11 +29,10 @@
<li class="{{ (location == 'pages') ? 'selected' : '' }}"> <li class="{{ (location == 'pages') ? 'selected' : '' }}">
<a href="{{ base_url_relative }}/pages"> <a href="{{ base_url_relative }}/pages">
<i class="fa fa-fw fa-file-text-o"></i> <i class="fa fa-fw fa-file-text-o"></i>
<em>{{ "PLUGIN_ADMIN.PAGES"|tu }} <em>{{ "PLUGIN_ADMIN.PAGES"|tu }}</em>
<span class="badges"> <span class="badges">
<span class="badge count">{{ admin.pagesCount }}</span> <span class="badge count">{{ admin.pagesCount }}</span>
</span> </span>
</em>
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -53,12 +52,11 @@
<li class="{{ (location == 'plugins') ? 'selected' : '' }}"> <li class="{{ (location == 'plugins') ? 'selected' : '' }}">
<a href="{{ base_url_relative }}/plugins"> <a href="{{ base_url_relative }}/plugins">
<i class="fa fa-fw fa-plug"></i> <i class="fa fa-fw fa-plug"></i>
<em>{{ "PLUGIN_ADMIN.PLUGINS"|tu }} <em>{{ "PLUGIN_ADMIN.PLUGINS"|tu }}</em>
<span class="badges"> <span class="badges">
<span class="badge updates"></span> <span class="badge updates"></span>
<span class="badge count">{{ admin.plugins|length }}</span> <span class="badge count">{{ admin.plugins|length }}</span>
</span> </span>
</em>
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -66,12 +64,11 @@
<li class="{{ (location == 'themes') ? 'selected' : '' }}"> <li class="{{ (location == 'themes') ? 'selected' : '' }}">
<a href="{{ base_url_relative }}/themes"> <a href="{{ base_url_relative }}/themes">
<i class="fa fa-fw fa-tint"></i> <i class="fa fa-fw fa-tint"></i>
<em>{{ "PLUGIN_ADMIN.THEMES"|tu }} <em>{{ "PLUGIN_ADMIN.THEMES"|tu }}</em>
<span class="badges"> <span class="badges">
<span class="badge updates"></span> <span class="badge updates"></span>
<span class="badge count">{{ admin.themes|length }}</span> <span class="badge count">{{ admin.themes|length }}</span>
</span> </span>
</em>
</a> </a>
</li> </li>
{% endif %} {% endif %}