more updates

This commit is contained in:
Andy Miller
2016-03-06 20:16:39 -07:00
parent 68f2ddf916
commit 91b48d7c1b
10 changed files with 41 additions and 4907 deletions

View File

@@ -1,54 +1 @@
@font-face {
font-family: "Montserrat";
font-weight: 400;
font-style: normal;
src: url("../fonts/Montserrat-regular/Montserrat-regular.eot");
src: url("../fonts/Montserrat-regular/Montserrat-regular.eot?#iefix") format("embedded-opentype"), local("Montserrat-regular"), url("../fonts/Montserrat-regular/Montserrat-regular.woff2") format("woff2"), url("../fonts/Montserrat-regular/Montserrat-regular.woff") format("woff"), url("../fonts/Montserrat-regular/Montserrat-regular.ttf") format("truetype"), url("../fonts/Montserrat-regular/Montserrat-regular.svg#Montserrat") format("svg"); }
@font-face {
font-family: "Lato";
font-weight: 300;
font-style: normal;
src: url("../fonts/Lato-300/Lato-300.eot");
src: url("../fonts/Lato-300/Lato-300.eot?#iefix") format("embedded-opentype"), local("Lato-300"), url("../fonts/Lato-300/Lato-300.woff2") format("woff2"), url("../fonts/Lato-300/Lato-300.woff") format("woff"), url("../fonts/Lato-300/Lato-300.ttf") format("truetype"), url("../fonts/Lato-300/Lato-300.svg#Lato") format("svg"); }
@font-face {
font-family: "Lato";
font-weight: 400;
font-style: normal;
src: url("../fonts/Lato-regular/Lato-regular.eot");
src: url("../fonts/Lato-regular/Lato-regular.eot?#iefix") format("embedded-opentype"), local("Lato-regular"), url("../fonts/Lato-regular/Lato-regular.woff2") format("woff2"), url("../fonts/Lato-regular/Lato-regular.woff") format("woff"), url("../fonts/Lato-regular/Lato-regular.ttf") format("truetype"), url("../fonts/Lato-regular/Lato-regular.svg#Lato") format("svg"); }
@font-face {
font-family: "Lato";
font-weight: 700;
font-style: normal;
src: url("../fonts/Lato-700/Lato-700.eot");
src: url("../fonts/Lato-700/Lato-700.eot?#iefix") format("embedded-opentype"), local("Lato-700"), url("../fonts/Lato-700/Lato-700.woff2") format("woff2"), url("../fonts/Lato-700/Lato-700.woff") format("woff"), url("../fonts/Lato-700/Lato-700.ttf") format("truetype"), url("../fonts/Lato-700/Lato-700.svg#Lato") format("svg"); }
@font-face {
font-family: "Inconsolata";
font-weight: 400;
font-style: normal;
src: url("../fonts/Inconsolata-regular/Inconsolata-regular.eot");
src: url("../fonts/Inconsolata-regular/Inconsolata-regular.eot?#iefix") format("embedded-opentype"), local("Inconsolata-regular"), url("../fonts/Inconsolata-regular/Inconsolata-regular.woff2") format("woff2"), url("../fonts/Inconsolata-regular/Inconsolata-regular.woff") format("woff"), url("../fonts/Inconsolata-regular/Inconsolata-regular.ttf") format("truetype"), url("../fonts/Inconsolata-regular/Inconsolata-regular.svg#Inconsolata") format("svg"); }
@font-face {
font-family: "Inconsolata";
font-weight: 700;
font-style: normal;
src: url("../fonts/Inconsolata-700/Inconsolata-700.eot");
src: url("../fonts/Inconsolata-700/Inconsolata-700.eot?#iefix") format("embedded-opentype"), local("Inconsolata-700"), url("../fonts/Inconsolata-700/Inconsolata-700.woff2") format("woff2"), url("../fonts/Inconsolata-700/Inconsolata-700.woff") format("woff"), url("../fonts/Inconsolata-700/Inconsolata-700.ttf") format("truetype"), url("../fonts/Inconsolata-700/Inconsolata-700.svg#Inconsolata") format("svg"); }
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; }
@font-face{font-family:"Montserrat";font-weight:400;font-style:normal;src:url("../fonts/Montserrat-regular/Montserrat-regular.eot");src:url("../fonts/Montserrat-regular/Montserrat-regular.eot?#iefix") format("embedded-opentype"),local("Montserrat-regular"),url("../fonts/Montserrat-regular/Montserrat-regular.woff2") format("woff2"),url("../fonts/Montserrat-regular/Montserrat-regular.woff") format("woff"),url("../fonts/Montserrat-regular/Montserrat-regular.ttf") format("truetype"),url("../fonts/Montserrat-regular/Montserrat-regular.svg#Montserrat") format("svg")}@font-face{font-family:"Lato";font-weight:300;font-style:normal;src:url("../fonts/Lato-300/Lato-300.eot");src:url("../fonts/Lato-300/Lato-300.eot?#iefix") format("embedded-opentype"),local("Lato-300"),url("../fonts/Lato-300/Lato-300.woff2") format("woff2"),url("../fonts/Lato-300/Lato-300.woff") format("woff"),url("../fonts/Lato-300/Lato-300.ttf") format("truetype"),url("../fonts/Lato-300/Lato-300.svg#Lato") format("svg")}@font-face{font-family:"Lato";font-weight:400;font-style:normal;src:url("../fonts/Lato-regular/Lato-regular.eot");src:url("../fonts/Lato-regular/Lato-regular.eot?#iefix") format("embedded-opentype"),local("Lato-regular"),url("../fonts/Lato-regular/Lato-regular.woff2") format("woff2"),url("../fonts/Lato-regular/Lato-regular.woff") format("woff"),url("../fonts/Lato-regular/Lato-regular.ttf") format("truetype"),url("../fonts/Lato-regular/Lato-regular.svg#Lato") format("svg")}@font-face{font-family:"Lato";font-weight:700;font-style:normal;src:url("../fonts/Lato-700/Lato-700.eot");src:url("../fonts/Lato-700/Lato-700.eot?#iefix") format("embedded-opentype"),local("Lato-700"),url("../fonts/Lato-700/Lato-700.woff2") format("woff2"),url("../fonts/Lato-700/Lato-700.woff") format("woff"),url("../fonts/Lato-700/Lato-700.ttf") format("truetype"),url("../fonts/Lato-700/Lato-700.svg#Lato") format("svg")}@font-face{font-family:"Inconsolata";font-weight:400;font-style:normal;src:url("../fonts/Inconsolata-regular/Inconsolata-regular.eot");src:url("../fonts/Inconsolata-regular/Inconsolata-regular.eot?#iefix") format("embedded-opentype"),local("Inconsolata-regular"),url("../fonts/Inconsolata-regular/Inconsolata-regular.woff2") format("woff2"),url("../fonts/Inconsolata-regular/Inconsolata-regular.woff") format("woff"),url("../fonts/Inconsolata-regular/Inconsolata-regular.ttf") format("truetype"),url("../fonts/Inconsolata-regular/Inconsolata-regular.svg#Inconsolata") format("svg")}@font-face{font-family:"Inconsolata";font-weight:700;font-style:normal;src:url("../fonts/Inconsolata-700/Inconsolata-700.eot");src:url("../fonts/Inconsolata-700/Inconsolata-700.eot?#iefix") format("embedded-opentype"),local("Inconsolata-700"),url("../fonts/Inconsolata-700/Inconsolata-700.woff2") format("woff2"),url("../fonts/Inconsolata-700/Inconsolata-700.woff") format("woff"),url("../fonts/Inconsolata-700/Inconsolata-700.ttf") format("truetype"),url("../fonts/Inconsolata-700/Inconsolata-700.svg#Inconsolata") format("svg")}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}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,10 +1 @@
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; }
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}

File diff suppressed because one or more lines are too long

2
themes/grav/gosass.sh Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/sh
gosass -input scss/ -output css-compiled/ -sourcemap -watch -style compressed

View File

@@ -25,6 +25,12 @@
@else if $breakpoint == desktop-only {
@media only #{$media} and (max-width: $desktop-container - 0.062) { @content; }
}
@else if $breakpoint == mobile-plus {
@media only #{$media} and (min-width: $mobile-container - 0.062) { @content; }
}
@else if $breakpoint == tablet-plus {
@media only #{$media} and (min-width: $tablet-container - 0.062) { @content; }
}
@else if $breakpoint == desktop-plus {
@media only #{$media} and (min-width: $desktop-container - 0.062) { @content; }
}

View File

@@ -6,7 +6,7 @@
@import "template/modules/base";
// Logo
$logo-bg: #1e333e !default;
$logo-bg: #1e333d !default;
$logo-link: #ffffff !default;
// Nav

View File

@@ -22,7 +22,7 @@ $sidebar-padding: 2rem;
//transition: opacity 0.2s 0s, visibility 0s 0s
}
@include breakpoint(desktop-plus) {
@include breakpoint(tablet-plus) {
float: left;
visibility: visible;
opacity: 1;
@@ -61,7 +61,7 @@ $sidebar-padding: 2rem;
}
.front-end {
@include breakpoint(desktop-plus) {
@include breakpoint(tablet-plus) {
display: none;
}
@@ -77,7 +77,7 @@ $sidebar-padding: 2rem;
display: none;
margin: 13px 0 12px;
@include breakpoint(desktop-plus) {
@include breakpoint(tablet-plus) {
display: inline-block;
}
@@ -92,7 +92,7 @@ $sidebar-padding: 2rem;
height: 40px;
margin: 13px 0 12px;
@include breakpoint(desktop-plus) {
@include breakpoint(tablet-plus) {
display: none;
}
@@ -119,10 +119,16 @@ $sidebar-padding: 2rem;
#admin-user-details, .admin-user-details {
padding: $sidebar-padding;
overflow: hidden;
text-align: left;
@include breakpoint(desktop-range) {
@include breakpoint(tablet-plus) {
padding: 12px;
text-align: center;;
text-align: center;
}
@include breakpoint(large-desktop-plus) {
padding: $sidebar-padding;
text-align: left;
}
img {
@@ -134,11 +140,16 @@ $sidebar-padding: 2rem;
.admin-user-names {
margin-left: 60px;
margin-top: 5px;
display: block;
@include breakpoint(desktop-range) {
@include breakpoint(tablet-plus) {
display: none;
}
@include breakpoint(large-desktop-plus) {
display: block;
}
h4, h5 {
margin: 0;
@@ -162,9 +173,13 @@ $sidebar-padding: 2rem;
em {
font-style: normal;
@include breakpoint(desktop-range) {
@include breakpoint(tablet-plus) {
display: none;
}
@include breakpoint(large-desktop-plus) {
display: inline;
}
}
li {
@@ -203,10 +218,6 @@ $sidebar-padding: 2rem;
padding-top: 0.7rem;
padding-bottom: 0.7rem;
@include breakpoint(tablet-range){
padding-left: 20px;
}
.fa {
@include transition(all 0.2s ease);
margin-right: 8px;
@@ -222,10 +233,6 @@ $sidebar-padding: 2rem;
&.selected {
a {
padding-left: 16px;
@include breakpoint(tablet-range){
padding-left: 11px;
}
}
}
}
@@ -234,7 +241,7 @@ $sidebar-padding: 2rem;
#admin-main {
@include breakpoint(desktop-plus) {
@include breakpoint(tablet-plus) {
margin-left: $sidebar-width-small;
}
@@ -421,7 +428,7 @@ $sidebar-padding: 2rem;
overflow-y: auto;
padding: 2.5rem;
@include breakpoint(desktop-plus) {
@include breakpoint(tablet-plus) {
left: $sidebar-width-small;
}

View File

@@ -7,8 +7,6 @@
*
*/
// @import "../bower_components/bourbon/app/assets/stylesheets/bourbon";
/* Toggle Switches
*/