Skip to content

Commit

Permalink
Merge pull request #165 from zurb/6.2-release
Browse files Browse the repository at this point in the history
update assets for foundation-6.2 release
  • Loading branch information
kball committed Mar 1, 2016
2 parents 9dcbefe + 36e1bcb commit 1302500
Show file tree
Hide file tree
Showing 93 changed files with 5,454 additions and 4,305 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Gem Version](https://badge.fury.io/rb/foundation-rails.svg)](https://badge.fury.io/rb/foundation-rails)

Foundation::Rails is a gem that makes it super easy to use Foundation in your upcoming Rails project. You can start using Foundation::Rails in your projects by following the instructions below.
**Foundation::Rails** is a gem that makes it super easy to use Foundation in your upcoming Rails project.

## Installation

Expand Down
6 changes: 5 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ namespace :assets do
manifest = js_files.map { |file| "//= require #{File.basename(file)}" }.join("\n")
File.write('vendor/assets/js/foundation.js', manifest)

puts 'Now update version.rb'
Dir['vendor/assets/js/*.js'].each do |file|
sh "mv #{file} #{file}.es6"
end

puts "\n*********************\n** ASSETS UPDATED! **\n*********************\n"
end

desc 'Remove old Foundation for Sites assets'
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "foundation-rails",
"version": "6.1.2.0",
"version": "6.2.0.0",
"dependencies": {
"foundation-sites": "6.1.2",
"foundation-sites": "6.2.0",
"motion-ui": "1.2.0"
}
}
1 change: 1 addition & 0 deletions foundation-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Gem::Specification.new do |spec|

spec.add_dependency "sass", [">= 3.3.0", "< 3.5"]
spec.add_dependency "railties", [">= 3.1.0"]
spec.add_dependency "sprockets-es6", [">= 0.9.0"]

spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "capybara"
Expand Down
1 change: 1 addition & 0 deletions lib/foundation-rails.rb
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
require 'foundation/rails'
require 'sprockets/es6'
2 changes: 1 addition & 1 deletion lib/foundation/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Foundation
module Rails
VERSION = "6.1.2.1"
VERSION = "6.2.0.0"
end
end
Loading

0 comments on commit 1302500

Please sign in to comment.