* stable:
Bump versions for v0.10.1 release.
Update the CHANGELOG for the v0.10.1 release.
Fix a broken reference to the extensions tutorial. Closes GH-135.
[Blueprint] Regression fix: automatically apply the reset if blueprint/reset is imported. Closes GH-132.
Fix a failing test case.
[Rails] When configuring the Sass::Plugin, don't overwrite existing template locations. Closes GH-136.
[Command Line] Improved descriptions of the watch and init commands.
[Rails] Improved the next steps to perform after installing compass so that it mentions registering the compass gem.
[Rails] Fixed a reference to the old configuration file.
Add a note to the changelog about uninstalling chriseppstein-compass
Get rid of some dead code that was breaking Rails 3. Closes GH-137.
Conflicts:
VERSION.yml
doc-src/content/CHANGELOG.markdown
frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/modules/_reset.sass
* stable:
[Command Line] Actually register the subcommand for listing frameworks
[Command Line] Add a sub command for emitting sass CLI imports
Every stable release is fine. no need to qualify it.
[Docs] Put Lorin's video on the homepage.
Conflicts:
doc-src/content/CHANGELOG.markdown
lib/compass/version.rb
* docs: (56 commits)
Turn on support for -ms in experimental properties.
document the hide-text mixin
Allow box shadow to be turned off by @include box-shadow(none). Closes GH-102.
Fix a broken link to the changelog
I guess I relied on that silly import.
Use the gemspec the way the ruby gods intended.
Better handling of the Compass::VERSION scheme.
RIP RUN_CODE_RUN
remove a doc reference to an obsolete file and add some meta descriptions.
document some small functional changes
fixed typo in demo header styles
allow overflow-x on code to scroll
example code in css-slideshows
mixin source uses :target for css interaction
more sensible nav markup/structure
Update the docs for lists.
Don't need rcov usually
Don't display a variable description for empty comments.
add a scroll bar for long mixin defs
More docs on the compass utilities.
...
Conflicts:
REVISION
* commit 'merbjedi/master':
Adding Pathname support to compass configs
Adding PathName support for add_project_configuration
Separating out Rails2 actionpack integration logic
