Commit Graph

817 Commits

Author SHA1 Message Date
Chris Eppstein
ebd758a799 Merge branch 'stable'
Conflicts:
	bin/compass
2011-11-06 18:02:41 -08:00
Chris Eppstein
4183a60e31 Handle frameworks without a templates directory. 2011-11-06 18:01:27 -08:00
Chris Eppstein
9888efdbc2 We actually count css selectors, not rules in compass stats 2011-11-06 18:01:27 -08:00
Scott Davis
bc3334bec9 you can now inline sprite images using $<map>-inline:true; before calling the @import closes #611 2011-11-04 10:47:31 -04:00
Scott Davis
f458519e01 fixes issue #602 2011-11-04 09:19:37 -04:00
Scott Davis
eb10566e02 fixed and issue with Sprokets trying to the the supreme ruler of the file paths! 2011-11-03 15:45:32 -04:00
Scott Davis
044855e04d Merge pull request #610 from coderanger/fix/inheritance
Handle Rails adding methods to nil that it really shouldn't.
2011-11-01 17:59:41 -07:00
Noah Kantrowitz
ca4af48b7d Handle Rails adding methods to nil that it really shouldn't. 2011-11-01 17:45:00 -07:00
Scott Davis
724a5dcc7d Merge pull request #603 from jdelStrother/precompile
Fix Railtie initialization when initialize_on_precompile is disabled
2011-11-01 11:05:35 -07:00
Scott Davis
fa49a6b933 i cant spell =( 2011-10-25 16:33:51 -04:00
Scott Davis
ab20a7b9d1 added sass functions to allow getting the unit value demensions of a sprite image 2011-10-25 16:14:46 -04:00
Scott Davis
16ff623732 desmelled the binding class 2011-10-25 15:55:06 -04:00
Scott Davis
98775ea1ec sprite importer will now use erb to generate scss to its easyer to manage 2011-10-25 15:47:58 -04:00
Scott Davis
e8becc7fee working on sprite importer with erb templates 2011-10-25 13:49:34 -04:00
Jonathan del Strother
87d3bdc09d Fix Railtie initialization when initialize_on_precompile is disabled 2011-10-12 15:27:00 +01:00
Scott Davis
dd75f7241e micro optimization via @brainopia 2011-10-09 09:19:27 -04:00
brainopia
93ff7b31ec merge 2011-10-09 09:15:57 -04: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
6b3b71ab37 Merge pull request #560 from johnbintz/rbx-sort-fix
Rubinius/JRuby sort fix
2011-09-19 12:31:39 -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
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
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
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
3e5b3cfbf6 dont cache in custom 2011-09-10 16:47:10 -04:00
Scott Davis
ec90cf515f fixed typo =( 2011-09-10 16:44:49 -04:00
Scott Davis
45b19df315 cache the image dimensions in sass options 2011-09-10 16:42:12 -04:00
Scott Davis
2367b9b9be dont cache 2011-09-10 16:38:36 -04:00
Scott Davis
2792ea3be4 prefix with :: just incase 2011-09-10 16:31:31 -04:00
Scott Davis
91aaa29df8 monkey patch to rails 3.1 image functions 2011-09-10 16:30:23 -04:00
Scott Davis
7f8b6c29e0 moved to private 2011-09-10 16:29:57 -04:00
Scott Davis
abace68275 some internal refactoring im image_functions 2011-09-10 16:22:43 -04:00
Raving Genius
3514898ea1 Stop requiring font type when type can be guessed from URL (issue #544) 2011-09-08 23:12:11 -04:00