lab2023#8 Font 'open sans' was integrated.

frralf · Jun 17, 2013 · ceae0f2 · ceae0f2
1 parent 215962c
commit ceae0f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/source/assets/stylesheets/application.css.sass b/source/assets/stylesheets/application.css.sass
@@ -1,4 +1,7 @@
 @import 'compass'
 @import 'variables'
 @import 'bootstrap'
-@import 'bootstrap-responsive'
+@import 'bootstrap-responsive'
+
+body, html
+  font-family: 'Open Sans', sans-serif
diff --git a/source/index.html.haml b/source/index.html.haml
@@ -1,4 +1,6 @@
 - @title = '## HIERAPOLIS ##'
 - @body_class = 'index'
 
-Hierapolis Rocks!
+Hierapolis Rocks!
+%a.btn.btn-large{:href => "#"}
+  %i.icon-rocket.icon-5x
diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml
@@ -19,9 +19,12 @@
     %link(rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/images/apple-touch-icon-57x57-precomposed.png")
     %link(rel="apple-touch-icon-precomposed" sizes="72x72" href="/assets/images/apple-touch-icon-72x72-precomposed.png")
     %link(rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/images/apple-touch-icon-114x114-precomposed.png")
-    = stylesheet_link_tag 'application',
-                          '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css',
-                          '//netdna.bootstrapcdn.com/font-awesome/3.2.0/css/font-awesome.css'
+
+    / Stylesheets (Don't change include order)
+    = stylesheet_link_tag '//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800&subset=latin-ext',
+                          'application',
+                          '//netdna.bootstrapcdn.com/font-awesome/3.2.0/css/font-awesome.min.css'
+
 
     = yield_content :head