Commit Graph

2270 Commits

Author SHA1 Message Date
Scott Davis
efdb00cc14 updated tests that the previous commit from @paulirish broke 2011-10-09 09:00:26 -04:00
Paul Irish
8ede06f001 more attractive whitespace for prefixed and aligned styles 2011-10-09 08:38:05 -04:00
Scott Davis
bd204a4f58 typo 2011-10-05 02:14:29 -04:00
Scott Davis
4fba9604eb Merge branch 'master' of github.com:chriseppstein/compass 2011-10-05 02:06:48 -04:00
Scott Davis
7e32d91ae6 updated spriting docs via #403 closes #403 2011-10-05 02:01:27 -04:00
Chris Eppstein
4c9656f35a Removed UTF-8 Character from the comments. 2011-10-04 13:26:06 -07:00
Colin Dean
656f12a4ab Fixed type conversion error
I encountered this when using jruby and passing an illegal option.
2011-10-02 01:58:32 -07:00
Scott Davis
067fb963df updated rake and cucumber so tests pass in 1.9.3 2011-09-26 13:42:12 -04:00
Chris Eppstein
d794394ceb Add missing test fixture. 2011-09-26 09:31:12 -07:00
Chris Eppstein
fecc98219d Refactor loggin within sprites
Handle missing logger instance more elegantly and centralize
relativizing and quiet mode checking.

Closes GH-84.
2011-09-26 09:00:51 -07:00
Scott Davis
9b56dc6169 updated for image_size monkey patch for api change 2011-09-24 01:21:41 -04:00
Chris Eppstein
d03d529909 Add a new compass-env() helper that returns the compass environment. 2011-09-20 09:36:40 -07:00
Chris Eppstein
972c53ecb5 Respect the --force option with sprite generation. 2011-09-19 18:19:42 -07:00
Chris Eppstein
38e4b3a3d9 Run a callback when a sprite is removed. 2011-09-19 18:19:04 -07:00
Chris Eppstein
71e5d28a29 Respect the --quiet option with sprite logging 2011-09-19 18:18:38 -07:00
Chris Eppstein
28daff6771 Assert that sprite offsets are numbers. 2011-09-19 17:59:37 -07:00
Chris Eppstein
1b3e7a3a6b Fix failing integration test. 2011-09-19 12:45:22 -07:00
Chris Eppstein
6b3b71ab37 Merge pull request #560 from johnbintz/rbx-sort-fix
Rubinius/JRuby sort fix
2011-09-19 12:31:39 -07:00
Chris Eppstein
c217edeed9 Fix broken tests 2011-09-19 11:04:35 -07:00
Chris Eppstein
942a84dca0 Tests need a logger. 2011-09-19 09:03:17 -07:00
Chris Eppstein
bfcff75c32 Handle the case where the there is not relative path to the images directory. 2011-09-19 09:03:02 -07:00
Chris Eppstein
b5ca89425d code cleanup 2011-09-19 07:41:32 -07:00
Chris Eppstein
de029babb5 Slightly prettier output during sprite file generation. 2011-09-19 07:41:32 -07:00
Chris Eppstein
ce853df6bf In some cases changing the layout doesn't force the sprite hash to change, so we have to make the layout part of the hash. 2011-09-19 07:41:32 -07:00
Chris Eppstein
8b33471229 Bump sprite version for this release. 2011-09-19 07:41:32 -07:00
Chris Eppstein
cd907d17a7 Log the creation or unchanged status of sprites during compilation. 2011-09-19 07:41:31 -07:00
Chris Eppstein
5fd2c14d06 A better setting to check if we are precompiling 2011-09-18 08:57:05 -07:00
John Bintz
c9593794bd better sorting of images coming into sprites, fixes one rbx error 2011-09-17 12:02:51 -04:00
Chris Eppstein
fe4edff7d4 Workaround for the deprecated static_root 2011-09-17 07:44:20 -07:00
Scott Davis
88ee68de5d Merge branch 'master' of github.com:chriseppstein/compass 2011-09-17 00:46:07 -04:00
Scott Davis
6cba5520aa fixed issue with showing positions and made the internal api consistant with the documentation 2011-09-17 00:45:35 -04:00
Chris Eppstein
d7a579ce58 Fix broken tests. 2011-09-16 18:00:00 -07:00
Chris Eppstein
87377ad7ff slightly better error message 2011-09-16 17:59:11 -07:00
Chris Eppstein
77321fdb80 Revert "Revert "removed useless unit""
This reverts commit f0f4ac9700.
2011-09-16 17:47:08 -07:00
Chris Eppstein
493f01c2c2 Update changelog 2011-09-16 16:02:48 -07:00
Chris Eppstein
78c102297b Merge pull request #537 from pzgz/master
Fixed errors when trying to compile examples by rake command. Update reference to the 960 grid plugin.
2011-09-16 16:01:01 -07:00
Chris Eppstein
155834b341 Merge remote branch 'botandrose/patch-4'
* botandrose/patch-4:
  add test for inline_font_files()
  Inline fonts weren't being base64 encoded.
2011-09-16 15:49:49 -07:00
Chris Eppstein
ea10cf43fc Merge branch 'stable'
* stable:
  Use the default compass images directory in the spriting tutorial
  added detail to rhythm-border documentation.
  update PIE.htc to Version 1.0beta5
  update PIE.htc to Version 1.0beta4
2011-09-16 15:21:55 -07:00
Chris Eppstein
1dd2563484 Use the default compass images directory in the spriting tutorial 2011-09-16 15:20:42 -07:00
Chris Eppstein
9d1e2c9bea Update changelog 2011-09-16 15:19:57 -07:00
Chris Eppstein
37c58300c0 Merge pull request #540 from boriskaiser/stable
update PIE.htc to Version 1.0beta4
2011-09-16 15:19:22 -07:00
Chris Eppstein
49ea916c58 Merge pull request #549 from ravinggenius/master
Test and refactoring of font_files (issues #543 and #544) on master branch
2011-09-16 14:57:02 -07:00
Beau Smith
9d48b2539c Fixing funny typo, abiding by the rules of using Compass. 2011-09-16 14:46:06 -07:00
Scott Davis
660c5697db image_size was causing issue with rails and the sass evaluation context 2011-09-15 11:25:57 -04:00
Scott Davis
e52184b6fe fixes #551 with failing test 2011-09-14 12:47:20 -04:00
Scott Davis
35b9b60c7c Sprite importer now passes the correct filename to the sass engine which was causeing unexpected uris to get returned
This fixes the 'to_tree' error that wasn't really a sass bug it was an error on the sprite importers part
2011-09-12 20:44:12 -04:00
Scott Davis
f0f4ac9700 Revert "removed useless unit"
This reverts commit a8ff39a8e4.

This commit was breaking tests
2011-09-12 20:42:33 -04:00
Eric Meyer
7fced9373e added detail to rhythm-border documentation. 2011-09-12 14:38:36 -06:00
Chris Eppstein
edc7942396 Merge branch 'stable'
* stable:
  changelog for user-select
  removed useless unit
  user-select mixin with docs and tests

Conflicts:
	doc-src/content/CHANGELOG.markdown
2011-09-12 13:37:32 -07:00
Eric Meyer
92981fb5d3 Merge pull request #509 from ericam/stable
user-select mixin with docs and tests
2011-09-12 13:23:30 -07:00