Attempting to fix fontawesome issue
This commit is contained in:
parent
a9d09e2349
commit
9147b67f30
2
Gemfile
2
Gemfile
@ -42,7 +42,7 @@ gem 'less-rails'
|
||||
gem 'sass-rails', '~> 4.0.0.rc1'
|
||||
gem 'therubyracer'
|
||||
gem 'turbolinks'
|
||||
gem 'twitter-bootstrap-rails'
|
||||
gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'rails4-assets'
|
||||
gem 'uglifier', '>= 1.3.0'
|
||||
|
||||
group :development, :test do
|
||||
|
27
Gemfile.lock
27
Gemfile.lock
@ -5,6 +5,17 @@ GIT
|
||||
specs:
|
||||
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
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
@ -34,7 +45,7 @@ GEM
|
||||
tzinfo (~> 0.3.37)
|
||||
addressable (2.3.4)
|
||||
arel (4.0.0)
|
||||
atomic (1.1.8)
|
||||
atomic (1.1.9)
|
||||
better_errors (0.8.0)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
@ -43,6 +54,7 @@ GEM
|
||||
builder (3.1.4)
|
||||
bullet (4.6.0)
|
||||
uniform_notifier
|
||||
callsite (0.0.11)
|
||||
capybara (2.1.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
@ -129,14 +141,15 @@ GEM
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
meta_request (0.2.3)
|
||||
meta_request (0.2.4)
|
||||
callsite
|
||||
rack-contrib
|
||||
railties
|
||||
method_source (0.8.1)
|
||||
mime-types (1.23)
|
||||
minitest (4.7.4)
|
||||
mono_logger (1.0.1)
|
||||
multi_json (1.7.2)
|
||||
multi_json (1.7.3)
|
||||
nokogiri (1.5.9)
|
||||
pg (0.15.1)
|
||||
polyglot (0.3.3)
|
||||
@ -169,7 +182,7 @@ GEM
|
||||
raindrops (0.11.0)
|
||||
rake (10.0.4)
|
||||
redis (3.0.4)
|
||||
redis-namespace (1.2.1)
|
||||
redis-namespace (1.3.0)
|
||||
redis (~> 3.0.0)
|
||||
ref (1.0.4)
|
||||
resque (1.24.1)
|
||||
@ -242,10 +255,6 @@ GEM
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.1.1)
|
||||
coffee-rails
|
||||
twitter-bootstrap-rails (2.2.6)
|
||||
actionpack (>= 3.1)
|
||||
execjs
|
||||
railties (>= 3.1)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (2.0.1)
|
||||
execjs (>= 0.3.0)
|
||||
@ -306,7 +315,7 @@ DEPENDENCIES
|
||||
therubyracer
|
||||
thin
|
||||
turbolinks
|
||||
twitter-bootstrap-rails
|
||||
twitter-bootstrap-rails!
|
||||
uglifier (>= 1.3.0)
|
||||
unicorn
|
||||
webmock
|
||||
|
@ -1,2 +1,4 @@
|
||||
- title t('hello')
|
||||
%h1= t('hello')
|
||||
%h1
|
||||
%i.icon-globe
|
||||
= t('hello')
|
||||
|
Loading…
x
Reference in New Issue
Block a user