diff --git a/middleman-more/features/sass-assets-paths.feature b/middleman-more/features/sass-assets-paths.feature index a28baae9..834fe74a 100644 --- a/middleman-more/features/sass-assets-paths.feature +++ b/middleman-more/features/sass-assets-paths.feature @@ -6,6 +6,6 @@ Feature: Support SASS assets paths When I go to "/stylesheets/plain.css" 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 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 "/* Works with shared SASS assets from external source directory */" diff --git a/middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass b/middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass similarity index 69% rename from middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass rename to middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass index cb909705..bbb7ae93 100644 --- a/middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass +++ b/middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass @@ -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 */ diff --git a/middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass b/middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass index 2c6d731b..275eb8b4 100644 --- a/middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass +++ b/middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass @@ -8,7 +8,7 @@ red @import "_shared-asset.scss" // without extension -@import "shared-asset" +@import "shared-asset-sass" // imported from outside of local 'assets/' directory @import "_partial.sass" diff --git a/middleman-more/lib/middleman-more/extensions/minify_css.rb b/middleman-more/lib/middleman-more/extensions/minify_css.rb index 72ab5cf4..43f64391 100644 --- a/middleman-more/lib/middleman-more/extensions/minify_css.rb +++ b/middleman-more/lib/middleman-more/extensions/minify_css.rb @@ -31,7 +31,7 @@ module Middleman class SassCompressor 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.render.strip end