* master: (23 commits)
updated change log
fixed horizontal height and width calculation
horizontal layout now respects positions and spacing correctly
Changed the descriptions of the sin, cos, and tan to be more descriptive.
derp double require
smart pack docs - forgot something
smart pack docs
smart packing implimentation thanks @johnbintz
tests for smart packing
smart packing helper classes
new tests
docs for diagonal layout
layout for diagonal sprite
added test for diagonal layout
fixed trig functions closes#498
patched image functions to accept a real path
Fix failing test for change to http_path in rails
Failing test for changing http_path with rails
reverted sorting back to one liner
more importer tests
...
Conflicts:
Gemfile.lock
* stable:
Version Bump.
Update changelog for 0.11.5
Reset only the block HTML elements #339
fix warning logic in vertical-rhythms module
Conflicts:
VERSION.yml
- used elements-of-type(html5-block) in all the reset stylesheets
(instead of duplicate tag enumerations)
- removed dialog
- canvas is inline, not block
Closes GH-339, GH-462.
* stable:
Fix failing test when updating to latest SASS
Gemfile.lock should not be part of a library / gem
fix typo
Fix issue with parent directory references within the sass_path in the compass compiler.
Version bump.
Update changelog
Return a non-zero exit code if there are any stylesheet compilation errors. Closes GH-432.
Fix test failures.
Better docs for the shadow mixins. Closes GH-433.
Include the Compass logger to prevent "uninitialized constant Compass::Logger"
Broken link fixed to what I think is the correct section of the SASS docs.
grid-background vertical rhythm should be based off of $blueprint-font-size, rather than a static value.
:focus should not use shorthand border property, since it only need to change the border-color
update changelog
Fix absolute path detection on Windows.
Fix the mime type returned for svg images. Closes GH-442.
Conflicts:
Gemfile.lock