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

Conflicts:
	themes/grav/css-compiled/template.css.map
This commit is contained in:
vivalldi
2015-09-04 19:32:15 -04:00
4 changed files with 22 additions and 19 deletions

View File

@@ -1617,22 +1617,24 @@ tr {
height: 37px;
display: inline-block;
vertical-align: inherit; }
#admin-topbar #admin-lang-toggle button {
background: #73448c;
color: rgba(255, 255, 255, 0.85);
border-radius: 4px; }
#admin-topbar #admin-lang-toggle button:hover {
background: #814c9d;
color: #fff; }
#admin-topbar #admin-lang-toggle button.dropdown-toggle {
background: #814c9d;
border-left: 1px solid #653c7b; }
#admin-topbar #admin-lang-toggle .dropdown-menu {
background: #9055AF; }
#admin-topbar #admin-lang-toggle .dropdown-menu button {
background: transparent;
color: #fff;
width: 100%; }
#admin-topbar #admin-lang-toggle {
z-index: 10; }
#admin-topbar #admin-lang-toggle button {
background: #73448c;
color: rgba(255, 255, 255, 0.85);
border-radius: 4px; }
#admin-topbar #admin-lang-toggle button:hover {
background: #814c9d;
color: #fff; }
#admin-topbar #admin-lang-toggle button.dropdown-toggle {
background: #814c9d;
border-left: 1px solid #653c7b; }
#admin-topbar #admin-lang-toggle .dropdown-menu {
background: #9055AF; }
#admin-topbar #admin-lang-toggle .dropdown-menu button {
background: transparent;
color: #fff;
width: 100%; }
#admin-topbar .switch-grav {
border: 0;
background-color: #365569; }

0
themes/grav/css/chartist.min.css vendored Normal file → Executable file
View File

6
themes/grav/js/chartist.min.js vendored Normal file → Executable file

File diff suppressed because one or more lines are too long

View File

@@ -205,6 +205,7 @@
}
#admin-lang-toggle {
z-index:10;
button {
@include button-color(shade($info-bg, 20%));
}