From 78f806d564c4ddc78519d1fdaa10a95de08a0e19 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 2 Mar 2016 16:06:11 +0100 Subject: [PATCH] Foundation updated to 6.2 --- Gemfile | 2 +- Gemfile.lock | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ae4c42a..5cbbba4 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ end # Zurb Foundation # https://github.com/zurb/foundation-rails -gem 'foundation-rails' +gem 'foundation-rails', '~> 6.2' # Pagination gem 'will_paginate' diff --git a/Gemfile.lock b/Gemfile.lock index f7ef570..d5b6012 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,10 @@ GEM tzinfo (~> 1.1) ansi (1.5.0) arel (6.0.3) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) @@ -91,9 +95,10 @@ GEM railties (>= 3.1.0, < 5.0) ffi (1.9.10) formatador (0.2.5) - foundation-rails (6.1.2.0) + foundation-rails (6.2.0.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) globalid (0.3.6) activesupport (>= 4.1.0) guard (2.13.0) @@ -236,6 +241,10 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-es6 (0.9.0) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) sprockets-rails (3.0.3) actionpack (>= 4.0) activesupport (>= 4.0) @@ -276,7 +285,7 @@ DEPENDENCIES debugger devise fancybox2-rails (~> 0.2.8) - foundation-rails + foundation-rails (~> 6.2) guard-minitest guard-rails jbuilder (~> 2.0)