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

Fixed some conflicts

Browse Source
This commit is contained in:
Andy Miller
2016-09-08 08:48:29 -06:00
parent 76be8eeb11
commit f119da9f36
7 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1 +1,3 @@
@import url("//fonts.googleapis.com/css?family=Montserrat:400|Lato:300,400,700|Inconsolata:400,700");body,h5,h6,.badge,.note,.grav-mdeditor-preview,input,select,textarea,button,.selectize-input{font-family:"Lato","Helvetica","Tahoma","Geneva","Arial",sans-serif}h1,h2,h3,h4,#admin-menu li,.form-tabs>label,.label{font-family:"Montserrat","Helvetica","Tahoma","Geneva","Arial",sans-serif}code,kbd,pre,samp,body .CodeMirror{font-family:"Inconsolata","Monaco","Consolas","Lucida Console",monospace !important}
/*# sourceMappingURL=fonts.css.map */

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

File diff suppressed because one or more lines are too long

2
themes/grav/css-compiled/preset.css.map
View File

File diff suppressed because one or more lines are too long

2
themes/grav/css-compiled/simple-fonts.css vendored
View File

@@ -1 +1,3 @@
body,h5,h6,.badge,.note,.grav-mdeditor-preview,input,select,textarea,button,.selectize-input,h1,h2,h3,h4,#admin-menu li,.form-tabs>label,.label{font-family:"Helvetica Neue", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif}code,kbd,pre,samp,body .CodeMirror{font-family:"Monaco", "Consolas", "Lucida Console", monospace}
/*# sourceMappingURL=simple-fonts.css.map */

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

File diff suppressed because one or more lines are too long

13
themes/grav/scss/preset.scss
View File

@@ -396,12 +396,13 @@ tr {
#admin-main {
//.grav-update {
//
// a.button, span.button, button.button {
// @include button-color(shade($update-bg, 20%), $update-text, true);
// }
//}
.grav-update {
background: rgba($update-bg, 50%);
color: $update-text;
a.button, span.button, button.button {
@include button-color(shade($update-bg, 20%), $update-text, true);
}
}
.titlebar {
background: $toolbar-bg;

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

@@ -606,57 +606,47 @@ body.sidebar-quickopen #admin-main {
}
}
.grav-update {
@include clearfix;
padding: 0 $padding-default;
margin-top: -2rem;
margin-bottom: 1rem;
display: none;
@include breakpoint(mobile-only) {
padding: 0 1rem;
}
//.grav-update {
// @include clearfix;
// padding: 0 $padding-default;
// margin-top: -$padding-default;
// display: none;
//
// @include breakpoint(mobile-only) {
// padding: 0 1rem;
// }
//
// &.plugins {
// padding-right: 1rem;
// }
//
// .button {
// float: right;
// margin-top: 0.6rem;
// margin-left: 1rem;
// line-height: 1.5;
// }
//
// p {
// line-height: $update-height;
// margin: 0;
// display: block;
// white-space: nowrap;
// overflow: hidden;
// -ms-text-overflow: ellipsis;
// text-overflow: ellipsis;
// }
//
// span[class="hint--left"]::after {
// line-height: 1.5;
// }
//
// i {
// padding-right: 0.5rem;
// }
//
// &.grav {
// margin-top: 0;
// @include transition (margin-top 0.15s ease-out);
//
// }
//}
.button {
float: right;
margin-top: 0.6rem;
margin-left: 1rem;
line-height: 1.5;
}
//.grav-update.grav + .content-wrapper {
// height: calc(100vh - #{$topbar-height} - #{$update-height});
//}
p {
line-height: $update-height;
margin: 0;
display: block;
white-space: nowrap;
overflow: hidden;
-ms-text-overflow: ellipsis;
text-overflow: ellipsis;
}
span[class="hint--left"]::after {
line-height: 1.5;
}
i {
padding-right: 0.5rem;
}
}
.grav-update.grav + .content-wrapper {
height: calc(100vh - #{$topbar-height} - #{$update-height});
}
.content-wrapper {
position: relative;