* stable:
Fix broken test.
tests for padding free horizontal list.
Update tests for charset changes.
Fix test failure in ruby 1.9.2
fix some gem issues
Option for horizontal-list to skip padding.
rake examples was getting a non-existent branch. Default to master.
update changelog
Make it easier to disable the asset cache buster.
Turns out that IE6 & 7 don't support this.
Fixed typo.
HTML5 reset includes box-model reset for newer browsers.
Added @charset declaration to force UTF-8 encoding on systems with different default encodings
Some doc modifications.
Conflicts:
Gemfile
doc-src/content/CHANGELOG.markdown
lib/compass/app_integration/rails/installer.rb
* stable: (81 commits)
Gemfiles for testing and a rails test helper that works for both rails 2 and rails 3.
provide correct installation steps when the compass validator is not found.
Fix a broken test case.
That wasn't supposed to be released yet.
Fixed error: there is no opposite-position(both)
Fix a bug in the statistics analyzer for rules with interpolation.
bump version for release
upgrade to bundler 1.0
link the docs to the stable branch.
Update the CHANGELOG for the 0.10.5 release
Read assets in binary mode for the windows users.
bump version.
Get the imports straightend out for the new mixins.
Bug fix: make the path-based configuration really work right.
inline-block-list tests
inline-block-list documentation
inline-block-list mixin
added additional html5 block-level elements per recommended reset stylesheet: http://html5doctor.com/html-5-reset-stylesheet/
Prepare for release.
Prepare for release
...
Conflicts:
VERSION.yml
doc-src/content/CHANGELOG.markdown
frameworks/blueprint/stylesheets/blueprint/_colors.scss
frameworks/compass/stylesheets/compass/css3/_box-shadow.scss
frameworks/compass/stylesheets/compass/css3/_font-face.scss
It now uses a hacked zoom property to target ie6 and 7 only so that they
gain layout. If you prefer an approach that validates, set:
$default-has-layout-approach: block;
and the has-layout mixin behavior will remain unchanged.
* commit 'merbjedi/master':
Adding Pathname support to compass configs
Adding PathName support for add_project_configuration
Separating out Rails2 actionpack integration logic
