From 23aae7c4f85ed777a73e3c97b5daf10452d55d68 Mon Sep 17 00:00:00 2001 From: James Martelletti Date: Tue, 23 Sep 2014 19:13:16 +1000 Subject: [PATCH 1/6] Fix reference to ApplicationController that doesn't always exist --- app/controllers/foundation/rails/styleguide_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/foundation/rails/styleguide_controller.rb b/app/controllers/foundation/rails/styleguide_controller.rb index d0d956b..3c5b89e 100644 --- a/app/controllers/foundation/rails/styleguide_controller.rb +++ b/app/controllers/foundation/rails/styleguide_controller.rb @@ -1,6 +1,6 @@ module Foundation module Rails - class StyleguideController < ApplicationController + class StyleguideController < ::ActionController::Base layout false def show From e374510187807d18b019b93ec5bc51c426306e56 Mon Sep 17 00:00:00 2001 From: Richard Sinn Date: Wed, 3 Dec 2014 17:59:40 -0800 Subject: [PATCH 2/6] Minor typo fix: Follow up to pull request #93 -> adding comma Forgot to add a comma in the `application.html.erb` template. --- lib/foundation/rails/templates/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/foundation/rails/templates/application.html.erb b/lib/foundation/rails/templates/application.html.erb index ecb39ce..8f1367a 100644 --- a/lib/foundation/rails/templates/application.html.erb +++ b/lib/foundation/rails/templates/application.html.erb @@ -8,7 +8,7 @@ <%%= stylesheet_link_tag "application" %> <%%= javascript_include_tag "vendor/modernizr" %> - <%%= javascript_include_tag "application" 'data-turbolinks-track' => true %> + <%%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%%= csrf_meta_tags %> From b208f2c2db910ae6553c48e4a8492bf5d9f6df98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20S=C3=A5gfors?= Date: Wed, 31 Dec 2014 16:25:55 +0200 Subject: [PATCH 3/6] Update sass dependency to >= 3.3.0, < 3.5 According to the Foundation changelog[1], version 5.5 is now compatible with Sass 3.4, while 3.2 compatibility has been removed. [1]: http://foundation.zurb.com/docs/changelog.html#5-5-december-12th-2014 --- foundation-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation-rails.gemspec b/foundation-rails.gemspec index 5f51000..661d0a8 100644 --- a/foundation-rails.gemspec +++ b/foundation-rails.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_development_dependency "bundler", "~> 1.3" - spec.add_dependency "sass", [">= 3.2.0", "< 3.4"] + spec.add_dependency "sass", [">= 3.3.0", "< 3.5"] spec.add_dependency "railties", [">= 3.1.0"] spec.add_development_dependency "rake" end From 8b1e37ffe3c38d5bedd9f12d54c4732141db6585 Mon Sep 17 00:00:00 2001 From: Kirill Platonov Date: Wed, 21 Jan 2015 23:25:16 +0300 Subject: [PATCH 4/6] Make generator compatible with .erb js files --- lib/foundation/rails/generators/install_generator.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/foundation/rails/generators/install_generator.rb b/lib/foundation/rails/generators/install_generator.rb index 49e9913..470754a 100644 --- a/lib/foundation/rails/generators/install_generator.rb +++ b/lib/foundation/rails/generators/install_generator.rb @@ -23,8 +23,11 @@ def add_assets def detect_js_format return ['.coffee', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee') + return ['.coffee.erb', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee.erb') return ['.js.coffee', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee') + return ['.js.coffee.erb', '#=', "\n() ->\n $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee.erb') return ['.js', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js') + return ['.js.erb', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js.erb') end def detect_css_format From 09cde4ddd6135e63bda773f2267b7eacb97e3fff Mon Sep 17 00:00:00 2001 From: Arthur Date: Mon, 2 Feb 2015 13:24:25 -0800 Subject: [PATCH 5/6] Updatin version --- lib/foundation/rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/foundation/rails/version.rb b/lib/foundation/rails/version.rb index 3a9ce07..6f0006c 100644 --- a/lib/foundation/rails/version.rb +++ b/lib/foundation/rails/version.rb @@ -1,5 +1,5 @@ module Foundation module Rails - VERSION = "5.5.0.0" + VERSION = "5.5.1.0" end end From 8ee53d18a72866122c581687f4e9ce8f739443bb Mon Sep 17 00:00:00 2001 From: Arthur Date: Mon, 9 Feb 2015 09:27:10 -0800 Subject: [PATCH 6/6] Bumping Version # for Assets --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 51033c0..b27c7e6 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "foundation-rails", - "version": "5.5.0.0", + "version": "5.5.1.1", "dependencies": { - "foundation": "5.5.0" + "foundation": "5.5.1" } }