Skip to content

Commit be3a8fc

Browse files
authored
Merge pull request #230 from brentdodell/upgrade-to-6-4-0
Upgrade to foundation-sites 6.4.1
2 parents 23edda0 + 77a5c5b commit be3a8fc

File tree

137 files changed

+6597
-2004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+6597
-2004
lines changed

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "foundation-rails",
3-
"version": "6.3.1.0",
3+
"version": "6.4.1.0",
44
"dependencies": {
5-
"foundation-sites": "6.3.1",
6-
"motion-ui": "1.2.2"
5+
"foundation-sites": "6.4.1",
6+
"motion-ui": "1.2.3"
77
}
88
}

lib/foundation/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Foundation
22
module Rails
3-
VERSION = "6.3.1.0"
3+
VERSION = "6.4.1.0"
44
end
55
end

lib/generators/foundation/install_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class InstallGenerator < ::Rails::Generators::Base
1313
def add_assets
1414
# rails_ujs breaks, need to incorporate rails-behavior plugin for this to work seamlessly
1515
# gsub_file "app/assets/javascripts/application#{detect_js_format[0]}", /\/\/= require jquery\n/, ""
16-
insert_into_file File.join(javascripts_base_dir, "application#{detect_js_format[0]}"), "#{detect_js_format[1]} require foundation\n", :after => "jquery_ujs\n"
16+
insert_into_file File.join(javascripts_base_dir, "application#{detect_js_format[0]}"), "#{detect_js_format[1]} require foundation\n", :after => "rails-ujs\n"
1717
append_to_file File.join(javascripts_base_dir, "application#{detect_js_format[0]}"), "#{detect_js_format[2]}"
1818
create_app_scss
1919
insert_into_file File.join(stylesheets_base_dir, "application#{detect_css_format[0]}"), "\n#{detect_css_format[1]} require foundation_and_overrides\n", :after => "require_self"

0 commit comments

Comments
 (0)