deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Correct path in sass-assets-path test

Browse source
This commit is contained in:
Thomas Reynolds 2012-07-25 11:50:56 -07:00
parent 1c9810483b
commit f1eae1e0c8
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
Master Master
=== ===
* Add `sass_assets_paths` option for arbitrary sass partial locations.
* Don't catch CoffeeScript errors when in build mode. * Don't catch CoffeeScript errors when in build mode.
* Extract load_paths so they aren't locked into the binary * Extract load_paths so they aren't locked into the binary
* Add middleman/rack for better config.ru support * Add middleman/rack for better config.ru support

10
middleman-core/lib/middleman-core/application.rb
View file

@ -107,16 +107,6 @@ module Middleman
# @return [String] # @return [String]
set :css_dir, "stylesheets" set :css_dir, "stylesheets"
# Location of javascripts external to source directory.
# @return [Array]
# set :js_assets_paths, ["#{root}/assets/javascripts/", "/path/2/external/js/repository/"]
set :js_assets_paths, []
# Location of SASS/SCSS files external to source directory.
# @return [Array]
# set :sass_assets_paths, ["#{root}/assets/sass/", "/path/2/external/sass/repository/"]
set :sass_assets_paths, []
# Location of images within source. Used by HTML helpers and Compass. # Location of images within source. Used by HTML helpers and Compass.
# @return [String] # @return [String]
set :images_dir, "images" set :images_dir, "images"

6
middleman-more/fixtures/sass-assets-path-app/config.rb
View file

@ -1,6 +1,4 @@
set :sass_assets_paths, [ set :sass_assets_paths, [
"#{root}/assets/stylesheets/", File.join(root, "assets", "stylesheets"),
# load from another app within gem source File.join(root, "my-vendor", "stylesheets")
"#{File.dirname(File.dirname(File.dirname(File.dirname(__FILE__))))}/fixtures/preview-app/source/stylesheets/"
] ]

2
middleman-more/fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass Normal file
View file

@ -0,0 +1,2 @@
body
font-size: 18px

5
middleman-more/lib/middleman-more/core_extensions/compass.rb
View file

@ -16,6 +16,11 @@ module Middleman
# Hooks to manually update the compass config after we're # Hooks to manually update the compass config after we're
# done with it # done with it
app.define_hook :compass_config app.define_hook :compass_config
# Location of SASS/SCSS files external to source directory.
# @return [Array]
# set :sass_assets_paths, ["#{root}/assets/sass/", "/path/2/external/sass/repository/"]
app.set :sass_assets_paths, []
app.after_configuration do app.after_configuration do
::Compass.configuration do |config| ::Compass.configuration do |config|