Move Google Fonts CSS to @import in CSS to simplify view

jacobrask · Sep 21, 2011 · a67de41 · a67de41
1 parent 22ea094
commit a67de41
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/app.coffee b/lib/app.coffee
@@ -28,10 +28,7 @@
                 title @title
                 meta name: 'viewport',
                      content: 'width=device-width,initial-scale=1.0'
-                link rel: 'stylesheet',
-                     href: 'http://fonts.googleapis.com/css?family=Delius'
-                link rel: 'stylesheet',
-                     href: '/style.css'
+                link rel: 'stylesheet', href: '/style.css'
                 script src: '/socket.io/socket.io.js'
                 script src: '/zappa/jquery.js'
                 script src: '/zappa/zappa.js'

diff --git a/public/style.css b/public/style.css
@@ -1,3 +1,4 @@
+@import url('http://fonts.googleapis.com/css?family=Delius');
 * {
   margin: 0;
   padding: 0;

diff --git a/public/style.scss b/public/style.scss
@@ -1,3 +1,5 @@
+@import url('http://fonts.googleapis.com/css?family=Delius');
+
 // MIXINS
 @mixin gradient-shadow {
     background-image: -webkit-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, .2)));