bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Attempting to fix fontawesome issue

Browse Source
This commit is contained in:
Geremia Taglialatela 2013-05-06 20:45:01 +02:00
parent a9d09e2349
commit 9147b67f30
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -42,7 +42,7 @@ gem 'less-rails'
gem 'sass-rails', '~> 4.0.0.rc1' gem 'sass-rails', '~> 4.0.0.rc1'
gem 'therubyracer' gem 'therubyracer'
gem 'turbolinks' gem 'turbolinks'
gem 'twitter-bootstrap-rails' gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'rails4-assets'
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
group :development, :test do group :development, :test do

27
Gemfile.lock
View File

@ -5,6 +5,17 @@ GIT
specs: specs:
database_cleaner (0.9.1) database_cleaner (0.9.1)
GIT
remote: git://github.com/diowa/twitter-bootstrap-rails.git
revision: 9f1a1cbfed8b2e79d75d0e5d58b4ce9588e389ae
branch: rails4-assets
specs:
twitter-bootstrap-rails (2.2.6)
actionpack (>= 3.1)
execjs
rails (>= 3.1)
railties (>= 3.1)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -34,7 +45,7 @@ GEM
tzinfo (~> 0.3.37) tzinfo (~> 0.3.37)
addressable (2.3.4) addressable (2.3.4)
arel (4.0.0) arel (4.0.0)
atomic (1.1.8) atomic (1.1.9)
better_errors (0.8.0) better_errors (0.8.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
@ -43,6 +54,7 @@ GEM
builder (3.1.4) builder (3.1.4)
bullet (4.6.0) bullet (4.6.0)
uniform_notifier uniform_notifier
callsite (0.0.11)
capybara (2.1.0) capybara (2.1.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
@ -129,14 +141,15 @@ GEM
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
meta_request (0.2.3) meta_request (0.2.4)
callsite
rack-contrib rack-contrib
railties railties
method_source (0.8.1) method_source (0.8.1)
mime-types (1.23) mime-types (1.23)
minitest (4.7.4) minitest (4.7.4)
mono_logger (1.0.1) mono_logger (1.0.1)
multi_json (1.7.2) multi_json (1.7.3)
nokogiri (1.5.9) nokogiri (1.5.9)
pg (0.15.1) pg (0.15.1)
polyglot (0.3.3) polyglot (0.3.3)
@ -169,7 +182,7 @@ GEM
raindrops (0.11.0) raindrops (0.11.0)
rake (10.0.4) rake (10.0.4)
redis (3.0.4) redis (3.0.4)
redis-namespace (1.2.1) redis-namespace (1.3.0)
redis (~> 3.0.0) redis (~> 3.0.0)
ref (1.0.4) ref (1.0.4)
resque (1.24.1) resque (1.24.1)
@ -242,10 +255,6 @@ GEM
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turbolinks (1.1.1) turbolinks (1.1.1)
coffee-rails coffee-rails
twitter-bootstrap-rails (2.2.6)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.37) tzinfo (0.3.37)
uglifier (2.0.1) uglifier (2.0.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@ -306,7 +315,7 @@ DEPENDENCIES
therubyracer therubyracer
thin thin
turbolinks turbolinks
twitter-bootstrap-rails twitter-bootstrap-rails!
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
unicorn unicorn
webmock webmock

4
app/views/pages/home.html.haml
View File

@ -1,2 +1,4 @@
- title t('hello') - title t('hello')
%h1= t('hello') %h1
%i.icon-globe
= t('hello')