From 80256ec3c5a578f743b3600dc9845e27e407e9a9 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 4 Apr 2014 10:38:50 -0700 Subject: [PATCH] revert back to sass 3.2 and stable compass --- CHANGELOG.md | 2 +- middleman-core/features/compass-sprites.feature | 2 +- middleman/middleman.gemspec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc7c4f0e..af1e7ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ master === * Update Padrino to 0.12.1. Introduces BREAKING CHANGE for Haml. Helpers which take blocks used to require `-` instead of `=` to work correctly. Now, all helpers which output content should use `=`. See: http://www.padrinorb.com/blog/upgrading-padrino-from-0-11-x-to-0-12-0-guide -* Update Sass to 3.3.x and Haml to 4.x +* Update Haml to 4.x * Disable Webrick reverse DNS lookup, vastly improving performance when accessing from a VM. * Ignore `node_modules` in FileWatcher * Add `tzinfo-data` for Windows users. diff --git a/middleman-core/features/compass-sprites.feature b/middleman-core/features/compass-sprites.feature index 871c277a..2de35eb1 100644 --- a/middleman-core/features/compass-sprites.feature +++ b/middleman-core/features/compass-sprites.feature @@ -3,4 +3,4 @@ Feature: Compass sprites should be generated on build and copied Given a successfully built app at "compass-sprites-app" When I cd to "build" Then the following files should exist: - | images/icon-s0de2218f58.png | \ No newline at end of file + | images/icon-s1a8aa64128.png | \ No newline at end of file diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index 5056012f..775c6c14 100644 --- a/middleman/middleman.gemspec +++ b/middleman/middleman.gemspec @@ -21,8 +21,8 @@ Gem::Specification.new do |s| s.add_dependency("middleman-core", Middleman::VERSION) s.add_dependency("middleman-sprockets", ">= 3.1.2") s.add_dependency("haml", [">= 4.0.5"]) - s.add_dependency("sass", [">= 3.3.4", "< 4.0"]) - s.add_dependency("compass", [">= 1.0.0.alpha.19"]) + s.add_dependency("sass", [">= 3.2.17", "< 4.0"]) + s.add_dependency("compass", [">= 0.12.4"]) s.add_dependency("uglifier", ["~> 2.5"]) s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("execjs", ["~> 1.4.0"])