Merge pull request #884 from consul/foundation_6

Includes Foundation 6 🎉
This commit is contained in:
Juanjo Bazán
2016-03-01 18:57:36 +01:00
141 changed files with 1849 additions and 3354 deletions

View File

@@ -159,8 +159,7 @@ GEM
i18n (~> 0.5)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
foundation-rails (5.5.3.2)
foundation-rails (6.1.2.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
foundation_rails_helper (1.1.0)
@@ -346,17 +345,6 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (1.8.4)
bundler
ffi (~> 1.9.6)
sass (>= 3.3.0)
sassc-rails (1.2.0)
railties (>= 4.0.0)
sass
sassc (~> 1.6)
sprockets (> 2.11)
sprockets-rails
tilt
savon (2.11.1)
akami (~> 1.2)
builder (>= 2.1.2)
@@ -487,7 +475,7 @@ DEPENDENCIES
rinku
rollbar (~> 2.8.0)
rspec-rails (~> 3.3)
sassc-rails
sass-rails (~> 5.0, >= 5.0.4)
savon
simple_captcha2
social-share-button!