adjustments after testing

roots-dev · Feb 1, 2016 · a8ac4ba · a8ac4ba
1 parent 534d081
commit a8ac4ba
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/root/assets/css/_global.css b/root/assets/css/_global.css
@@ -0,0 +1,8 @@
+body
+  padding: 50px
+  font-family: "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif
+  color: #555
+  -webkit-font-smoothing: antialiased
+  -webkit-text-size-adjust: 100%
+  -ms-text-size-adjust: 100%
+  font-size-adjust: auto
diff --git a/root/assets/css/global.css b/root/assets/css/global.css
diff --git a/root/assets/css/master.css b/root/assets/css/master.css
@@ -2,4 +2,4 @@
 /* Use this file to split out your css to multiple files. Just make sure to
    @import the file name here so it's included! */
 
-@import "global"
+@import "_global"
diff --git a/root/views/index.jade b/root/views/index.jade
@@ -1,6 +1,6 @@
 extends layout
 
 block content
-  h3 Welcome to roots!
+  h3 Welcome to Roots!
   :marked
     Find tutorials and documentation at http://roots.cx : )
diff --git a/root/views/layout.jade b/root/views/layout.jade
@@ -9,7 +9,7 @@ html
     //- uncomment if your site is responsive!
     //- meta(name="viewport" content="width=device-width, initial-scale=1")
     title= _path
-    != css()
+    link(rel='stylesheet', href='css/master.css')
 
   body
     block content