Don't override bootstrap default typo

distribworks · Sep 19, 2018 · 3fe63a6 · 3fe63a6
1 parent a5d815f
commit 3fe63a6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/dkron/bindata.go b/dkron/bindata.go
diff --git a/static/css/app.css b/static/css/app.css
diff --git a/static/css/app.css.map b/static/css/app.css.map
diff --git a/static/scss/_variables.scss b/static/scss/_variables.scss
@@ -1,7 +1,6 @@
 
 /** Font vars **/
-
-$font-headlines:'Lato', 'Open-Sans', Sans-serif;
+$font-headlines:'Montserrat', 'Open-Sans', Sans-serif;
 
 
 $color-base:#72A6B2;

diff --git a/static/scss/components/_navigation.scss b/static/scss/components/_navigation.scss
@@ -58,7 +58,6 @@
       color: #FFF;
       padding:0;
       line-height: 1em;
-      font-family:$font-headlines;
       font-size:.9em!important;
       text-transform:uppercase;
 

diff --git a/static/scss/components/_typography.scss b/static/scss/components/_typography.scss
@@ -1,7 +1,6 @@
-@import url(https://fonts.googleapis.com/css?family=Lato:400,300);
+@import url(https://fonts.googleapis.com/css?family=Montserrat:400,300);
 
 h1, h2, h3, h4, h5, h6 {
-  font-family:$font-headlines;
   margin-bottom:1em;
 }
 

diff --git a/static/scss/layout/_base.scss b/static/scss/layout/_base.scss
@@ -3,7 +3,6 @@ html {
 }
 
 body {
-  font-family:$font-headlines;
   padding-top:90px;
   background-color: #eee;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ html { @@
     }
     body {
-      font-family:$font-headlines;
       padding-top:90px;
       background-color: #eee;
     }
@@ Expand Down @@