Skip to content

Commit

Permalink
lab2023#3 Font awesome was integrated.
Browse files Browse the repository at this point in the history
  • Loading branch information
coskuntekin committed Jun 14, 2013
1 parent 57f5f93 commit a221df3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
4 changes: 4 additions & 0 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
config.javascripts_dir = 'assets/javascripts'
end

# Cache Buster
#activate :asset_hash
activate :cache_buster

###
# Page options, layouts, aliases and proxies
###
Expand Down
12 changes: 4 additions & 8 deletions source/assets/stylesheets/application.css.sass
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@import "compass"
@import "variables"
@import "bootstrap"
@import "bootstrap-responsive"

body
padding-top: 60px
padding-bottom: 40px
@import 'compass'
@import 'variables'
@import 'bootstrap'
@import 'bootstrap-responsive'
2 changes: 1 addition & 1 deletion source/index.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- @title = '## HIERAPOLIS ##'
- @body_class = 'index'

HIERAPOLIS
Hierapolis Rocks!
12 changes: 7 additions & 5 deletions source/layouts/layout.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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

Expand All @@ -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'
Expand Down

0 comments on commit a221df3

Please sign in to comment.