Updated gems
Fontawesome 3.2.1 Updated CHANGELOG Bumped version to 0.6.0
This commit is contained in:
parent
df96c80a02
commit
3fd223e322
@ -1,6 +1,10 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
0.6.0
|
||||||
|
-----
|
||||||
|
* Fontawesome 3.2.1
|
||||||
|
|
||||||
0.5.1
|
0.5.1
|
||||||
-----
|
-----
|
||||||
* Fixed specs
|
* Fixed specs
|
||||||
|
2
Gemfile
2
Gemfile
@ -42,7 +42,7 @@ gem 'less-rails'
|
|||||||
gem 'sass-rails', '~> 4.0.0.rc2'
|
gem 'sass-rails', '~> 4.0.0.rc2'
|
||||||
gem 'therubyracer'
|
gem 'therubyracer'
|
||||||
gem 'turbolinks'
|
gem 'turbolinks'
|
||||||
gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.0'
|
gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1'
|
||||||
gem 'uglifier', '>= 1.3.0'
|
gem 'uglifier', '>= 1.3.0'
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
|
14
Gemfile.lock
14
Gemfile.lock
@ -1,7 +1,7 @@
|
|||||||
GIT
|
GIT
|
||||||
remote: git://github.com/diowa/twitter-bootstrap-rails.git
|
remote: git://github.com/diowa/twitter-bootstrap-rails.git
|
||||||
revision: bfc3bfecf6ff0e47a12c7ca25702edd44a4f6ed8
|
revision: 05f7e9fa7f1c7d7101d2f177169e8d632b9b9e65
|
||||||
branch: fontawesome-3.2.0
|
branch: fontawesome-3.2.1
|
||||||
specs:
|
specs:
|
||||||
twitter-bootstrap-rails (2.2.7)
|
twitter-bootstrap-rails (2.2.7)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
@ -106,7 +106,7 @@ GEM
|
|||||||
haml_assets (0.2.2)
|
haml_assets (0.2.2)
|
||||||
haml
|
haml
|
||||||
tilt
|
tilt
|
||||||
handlebars_assets (0.13.0)
|
handlebars_assets (0.14.0)
|
||||||
execjs (>= 1.2.9)
|
execjs (>= 1.2.9)
|
||||||
sprockets (>= 2.0.3)
|
sprockets (>= 2.0.3)
|
||||||
tilt
|
tilt
|
||||||
@ -142,7 +142,7 @@ GEM
|
|||||||
mini_portile (0.5.0)
|
mini_portile (0.5.0)
|
||||||
minitest (4.7.4)
|
minitest (4.7.4)
|
||||||
mono_logger (1.1.0)
|
mono_logger (1.1.0)
|
||||||
multi_json (1.7.6)
|
multi_json (1.7.7)
|
||||||
nokogiri (1.6.0)
|
nokogiri (1.6.0)
|
||||||
mini_portile (~> 0.5.0)
|
mini_portile (~> 0.5.0)
|
||||||
pg (0.15.1)
|
pg (0.15.1)
|
||||||
@ -153,7 +153,7 @@ GEM
|
|||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
pry-rails (0.3.1)
|
pry-rails (0.3.1)
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
puma (2.0.1)
|
puma (2.1.1)
|
||||||
rack (>= 1.1, < 2.0)
|
rack (>= 1.1, < 2.0)
|
||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-contrib (1.1.0)
|
rack-contrib (1.1.0)
|
||||||
@ -176,7 +176,7 @@ GEM
|
|||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.11.0)
|
raindrops (0.11.0)
|
||||||
rake (10.0.4)
|
rake (10.1.0)
|
||||||
redis (3.0.4)
|
redis (3.0.4)
|
||||||
redis-namespace (1.3.0)
|
redis-namespace (1.3.0)
|
||||||
redis (~> 3.0.0)
|
redis (~> 3.0.0)
|
||||||
@ -251,7 +251,7 @@ GEM
|
|||||||
uglifier (2.1.1)
|
uglifier (2.1.1)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.0, >= 1.0.2)
|
multi_json (~> 1.0, >= 1.0.2)
|
||||||
unicorn (4.6.2)
|
unicorn (4.6.3)
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
rack
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
- title t('hello')
|
- title t('hello')
|
||||||
%h1
|
%h1
|
||||||
%i.icon-sun
|
%i.icon-gear
|
||||||
Here comes the sun
|
Top Gear
|
||||||
%p.lead.muted
|
%p.lead.muted
|
||||||
Ruby 2 + Rails 4.0.0.rc2 + Bootstrap 2.3.2 + Font Awesome 3.2.0
|
Ruby 2 + Rails 4.0.0.rc2 + Bootstrap 2.3.2 + Font Awesome 3.2.1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user