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

Fixes for alpha Sass versions

Browse source
This commit is contained in:
Ben Hollis 2013-04-04 23:19:10 -07:00
parent c2ffa538ad
commit 044b49d83b
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-more/features/sass-assets-paths.feature
View file

@ -6,6 +6,6 @@ Feature: Support SASS assets paths
When I go to "/stylesheets/plain.css" When I go to "/stylesheets/plain.css"
Then I should see "color: green;" Then I should see "color: green;"
Then I should see "/* Works with shared SCSS assets from APPROOT/assets/stylesheets/_shared-asset.scss */" Then I should see "/* Works with shared SCSS assets from APPROOT/assets/stylesheets/_shared-asset.scss */"
Then I should see "/* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset.sass */" Then I should see "/* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset-sass.sass */"
Then I should see "font-size: 18px" Then I should see "font-size: 18px"
Then I should see "/* Works with shared SASS assets from external source directory */" Then I should see "/* Works with shared SASS assets from external source directory */"

2
middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass → middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass
View file

@ -1 +1 @@
/* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset.sass */ /* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset-sass.sass */

2
middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
View file

@ -8,7 +8,7 @@ red
@import "_shared-asset.scss" @import "_shared-asset.scss"
// without extension // without extension
@import "shared-asset" @import "shared-asset-sass"
// imported from outside of local 'assets/' directory // imported from outside of local 'assets/' directory
@import "_partial.sass" @import "_partial.sass"

2
middleman-more/lib/middleman-more/extensions/minify_css.rb
View file

@ -31,7 +31,7 @@ module Middleman
class SassCompressor class SassCompressor
def self.compress(style, options = {}) def self.compress(style, options = {})
root_node = ::Sass::SCSS::CssParser.new(style, 'jammit-combined-input').parse root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
root_node.options = { :style => :compressed } root_node.options = { :style => :compressed }
root_node.render.strip root_node.render.strip
end end