Skip to content

Commit

Permalink
namespace assets
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Hayes committed Jun 26, 2012
1 parent aa7ab84 commit 72c872a
Show file tree
Hide file tree
Showing 27 changed files with 30 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
foundation (3.0.0.alpha12)
foundation (3.0.0.alpha14)
compass (~> 0.12.1)
linguistics (~> 1.0.9)
modular-scale (~> 0.0.5)
Expand Down
6 changes: 5 additions & 1 deletion lib/foundation.rb
Expand Up @@ -4,7 +4,11 @@
Linguistics::use( :en )
require "compass"
extension_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
Compass::Frameworks.register("foundation", :path => extension_path)
javascripts_dir = "/../../vendor/assets/javascripts/foundation/"
images_dir = "/../../vendor/assets/images/foundation/"
config = {:path => extension_path}
config.merge(:javascripts_dir => javascripts_dir, :images_dir => images_dir) if defined?(Rails)
Compass::Frameworks.register("foundation", config)
require "foundation/sass_script_functions"

module Foundation
Expand Down
2 changes: 1 addition & 1 deletion lib/foundation/version.rb
@@ -1,3 +1,3 @@
module Foundation
VERSION = "3.0.0.alpha13"
VERSION = "3.0.0.alpha14"
end
46 changes: 23 additions & 23 deletions templates/project/manifest.rb
Expand Up @@ -9,14 +9,14 @@
# Copy files down locally first
root_path = extension_path = File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))

javascript '/../../vendor/assets/javascripts/jquery.min.js', :to => 'jquery.min.js'
javascript '/../../vendor/assets/javascripts/modernizr.foundation.js', :to => 'foundation/modernizr.foundation.js'
javascript '/../../vendor/assets/javascripts/jquery.customforms.js', :to => 'foundation/jquery.customforms.js'
javascript '/../../vendor/assets/javascripts/jquery.reveal.js', :to => 'foundation/jquery.reveal.js'
javascript '/../../vendor/assets/javascripts/jquery.orbit-1.4.0.js', :to => 'foundation/jquery.orbit-1.4.0.js'
javascript '/../../vendor/assets/javascripts/jquery.tooltips.js', :to => 'foundation/jquery.tooltips.js'
javascript '/../../vendor/assets/javascripts/jquery.placeholder.min.js', :to => 'foundation/jquery.placeholder.min.js'
javascript '/../../vendor/assets/javascripts/app.js', :to => 'app.js'
javascript 'jquery.min.js', :to => 'jquery.min.js'
javascript 'modernizr.foundation.js', :to => 'foundation/modernizr.foundation.js'
javascript 'jquery.customforms.js', :to => 'foundation/jquery.customforms.js'
javascript 'jquery.reveal.js', :to => 'foundation/jquery.reveal.js'
javascript 'jquery.orbit-1.4.0.js', :to => 'foundation/jquery.orbit-1.4.0.js'
javascript 'jquery.tooltips.js', :to => 'foundation/jquery.tooltips.js'
javascript 'jquery.placeholder.min.js', :to => 'foundation/jquery.placeholder.min.js'
javascript 'app.js', :to => 'app.js'

# Make sure you list all the project template files here in the manifest.
html 'index.html'
Expand All @@ -25,21 +25,21 @@
file 'MIT-LICENSE.txt'

# Image Files
image '/../../vendor/assets/images/misc/button-gloss.png', :to => 'foundation/misc/button-gloss.png'
image '/../../vendor/assets/images/misc/button-overlay.png', :to => 'foundation/misc/button-overlay.png'
image '/../../vendor/assets/images/misc/custom-form-sprites.png', :to => 'foundation/misc/custom-form-sprites.png'
image '/../../vendor/assets/images/misc/input-bg.png', :to => 'foundation/misc/input-bg.png'
image '/../../vendor/assets/images/misc/input-bg-outset.png', :to => 'foundation/misc/input-bg-outset.png'
image '/../../vendor/assets/images/misc/modal-gloss.png', :to => 'foundation/misc/modal-gloss.png'
image '/../../vendor/assets/images/misc/table-sorter.png', :to => 'foundation/misc/table-sorter.png'
image '/../../vendor/assets/images/orbit/bullets.jpg', :to => 'foundation/orbit/bullets.jpg'
image '/../../vendor/assets/images/orbit/left-arrow.png', :to => 'foundation/orbit/left-arrow.png'
image '/../../vendor/assets/images/orbit/loading.gif', :to => 'foundation/orbit/loading.gif'
image '/../../vendor/assets/images/orbit/mask-black.png', :to => 'foundation/orbit/mask-black.png'
image '/../../vendor/assets/images/orbit/pause-black.png', :to => 'foundation/orbit/pause-black.png'
image '/../../vendor/assets/images/orbit/right-arrow.png', :to => 'foundation/orbit/right-arrow.png'
image '/../../vendor/assets/images/orbit/rotator-black.png', :to => 'foundation/orbit/rotator-black.png'
image '/../../vendor/assets/images/orbit/timer-black.png', :to => 'foundation/orbit/timer-black.png'
image 'misc/button-gloss.png', :to => 'foundation/misc/button-gloss.png'
image 'misc/button-overlay.png', :to => 'foundation/misc/button-overlay.png'
image 'misc/custom-form-sprites.png', :to => 'foundation/misc/custom-form-sprites.png'
image 'misc/input-bg.png', :to => 'foundation/misc/input-bg.png'
image 'misc/input-bg-outset.png', :to => 'foundation/misc/input-bg-outset.png'
image 'misc/modal-gloss.png', :to => 'foundation/misc/modal-gloss.png'
image 'misc/table-sorter.png', :to => 'foundation/misc/table-sorter.png'
image 'orbit/bullets.jpg', :to => 'foundation/orbit/bullets.jpg'
image 'orbit/left-arrow.png', :to => 'foundation/orbit/left-arrow.png'
image 'orbit/loading.gif', :to => 'foundation/orbit/loading.gif'
image 'orbit/mask-black.png', :to => 'foundation/orbit/mask-black.png'
image 'orbit/pause-black.png', :to => 'foundation/orbit/pause-black.png'
image 'orbit/right-arrow.png', :to => 'foundation/orbit/right-arrow.png'
image 'orbit/rotator-black.png', :to => 'foundation/orbit/rotator-black.png'
image 'orbit/timer-black.png', :to => 'foundation/orbit/timer-black.png'


help %Q{
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 72c872a

Please sign in to comment.