Please sign in to comment.
Merge branch 'master' into awesome_media
* master: (23 commits) [Sass] Proper fix for GH-275 that doesn't break other tests. Closes GH-281. Revert "Disable rubyforge releasing until we get a project set up." Disable rubyforge releasing until we get a project set up. Watch for updates on port 3124. [Sass] Support --unix-newlines on Unix. [Sass] Properly detect SCSS with -c. Fix a typo. Clean up a few tests. Track the original filename of a sass file even within imports. We don't need to assume anything about cached root nodes anymore. Propagate Util.dump and Util.load through to child nodes and importers. [Emacs] Allow indentation beneath for loops. [Sass] Make color names csae-insensitive. [Sass] Add a changelog entry about aab0567. [Sass] Add an #invert function. [Sass] Clean up a little. Fix bug in compressed output of SCSS selectors with newlines. [Sass] Get rid of Compiler#forbid_update?. Allow objects that are not sass trees to be placed into the sass cache. Fixed one last reference to Sass::Files. ... Conflicts: test/sass/engine_test.rb
- Loading branch information...
Showing with 227 additions and 51 deletions.
- +14 −0 doc-src/SASS_CHANGELOG.md
- +1 −1 extra/update_watch.rb
- +3 −8 lib/sass/cache_store.rb
- +3 −0 lib/sass/engine.rb
- +4 −6 lib/sass/exec.rb
- +1 −6 lib/sass/plugin/compiler.rb
- +1 −1 lib/sass/script/color.rb
- +17 −0 lib/sass/script/functions.rb
- +18 −9 lib/sass/script/number.rb
- +1 −1 lib/sass/script/parser.rb
- +11 −1 lib/sass/tree/node.rb
- +1 −1 lib/sass/tree/rule_node.rb
- +23 −16 lib/sass/util.rb
- +7 −0 test/sass/cache_test.rb
- +14 −0 test/sass/engine_test.rb
- +9 −0 test/sass/functions_test.rb
- +22 −0 test/sass/importer_test.rb
- +49 −0 test/sass/mock_importer.rb
- +10 −0 test/sass/script_test.rb
- +14 −0 test/sass/scss/scss_test.rb
- +4 −1 test/sass/test_helper.rb
Oops, something went wrong.