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

revert back to sass 3.2 and stable compass

Browse source
This commit is contained in:
Thomas Reynolds 2014-04-04 10:38:50 -07:00
parent bf62454dc2
commit 80256ec3c5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -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 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. * Disable Webrick reverse DNS lookup, vastly improving performance when accessing from a VM.
* Ignore `node_modules` in FileWatcher * Ignore `node_modules` in FileWatcher
* Add `tzinfo-data` for Windows users. * Add `tzinfo-data` for Windows users.

2
middleman-core/features/compass-sprites.feature
View file

@ -3,4 +3,4 @@ Feature: Compass sprites should be generated on build and copied
Given a successfully built app at "compass-sprites-app" Given a successfully built app at "compass-sprites-app"
When I cd to "build" When I cd to "build"
Then the following files should exist: Then the following files should exist:
| images/icon-s0de2218f58.png | | images/icon-s1a8aa64128.png |

4
middleman/middleman.gemspec
View file

@ -21,8 +21,8 @@ Gem::Specification.new do |s|
s.add_dependency("middleman-core", Middleman::VERSION) s.add_dependency("middleman-core", Middleman::VERSION)
s.add_dependency("middleman-sprockets", ">= 3.1.2") s.add_dependency("middleman-sprockets", ">= 3.1.2")
s.add_dependency("haml", [">= 4.0.5"]) s.add_dependency("haml", [">= 4.0.5"])
s.add_dependency("sass", [">= 3.3.4", "< 4.0"]) s.add_dependency("sass", [">= 3.2.17", "< 4.0"])
s.add_dependency("compass", [">= 1.0.0.alpha.19"]) s.add_dependency("compass", [">= 0.12.4"])
s.add_dependency("uglifier", ["~> 2.5"]) s.add_dependency("uglifier", ["~> 2.5"])
s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("coffee-script", ["~> 2.2.0"])
s.add_dependency("execjs", ["~> 1.4.0"]) s.add_dependency("execjs", ["~> 1.4.0"])