From a221df3f2ad57c5d4b2371072cf41a8a8aeabd15 Mon Sep 17 00:00:00 2001 From: coskuntekin Date: Fri, 14 Jun 2013 14:00:41 +0300 Subject: [PATCH] #3 Font awesome was integrated. --- config.rb | 4 ++++ source/assets/stylesheets/application.css.sass | 12 ++++-------- source/index.html.haml | 2 +- source/layouts/layout.haml | 12 +++++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config.rb b/config.rb index 2300fe6..e51c43f 100755 --- a/config.rb +++ b/config.rb @@ -20,6 +20,10 @@ config.javascripts_dir = 'assets/javascripts' end +# Cache Buster +#activate :asset_hash +activate :cache_buster + ### # Page options, layouts, aliases and proxies ### diff --git a/source/assets/stylesheets/application.css.sass b/source/assets/stylesheets/application.css.sass index cb11256..548bf35 100755 --- a/source/assets/stylesheets/application.css.sass +++ b/source/assets/stylesheets/application.css.sass @@ -1,8 +1,4 @@ -@import "compass" -@import "variables" -@import "bootstrap" -@import "bootstrap-responsive" - -body - padding-top: 60px - padding-bottom: 40px \ No newline at end of file +@import 'compass' +@import 'variables' +@import 'bootstrap' +@import 'bootstrap-responsive' \ No newline at end of file diff --git a/source/index.html.haml b/source/index.html.haml index a02f514..7d7bc04 100755 --- a/source/index.html.haml +++ b/source/index.html.haml @@ -1,4 +1,4 @@ - @title = '## HIERAPOLIS ##' - @body_class = 'index' -HIERAPOLIS \ No newline at end of file +Hierapolis Rocks! \ No newline at end of file diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml index 91d8e26..ec12a28 100755 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.haml @@ -9,7 +9,7 @@ %meta(http-equiv="x-ua-compatible" content="ie=edge,chrome=1") %meta(name="description" content="") %meta(name="author" content="") - %meta{content: "initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width", name: "viewport"} + %meta{content: 'initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width', name: 'viewport'} %meta(name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)") %meta(name='apple-mobile-web-app-capable' content='yes') %meta(name='apple-mobile-web-app-status-bar-style' content='translucent-black') @@ -19,7 +19,9 @@ %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' + = 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' = yield_content :head @@ -28,9 +30,9 @@ = yield / Javascripts - = javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js' - = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js' - = javascript_include_tag 'application' + = javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js', + '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js', + 'application' / Google Analytics = partial 'partials/trackers'