Commit Graph

784 Commits

Author SHA1 Message Date
John Bintz
c9593794bd better sorting of images coming into sprites, fixes one rbx error 2011-09-17 12:02:51 -04: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
Micah Geisel
bced277049 Inline fonts weren't being base64 encoded. 2011-09-06 14:57:34 -07:00
Scott Davis
8ccdab41cc refactored for cleanliness 2011-09-06 15:48:10 -04:00
Scott Davis
09dd9456e1 diagonal layout now goes i nthe correct direction and refactored some internals 2011-09-03 15:56:57 -04:00
Lloyd Kupchanko
375c08b60e Fix for issue #522 2011-08-30 21:39:02 -06:00
Chris Eppstein
7147147e24 Make sprites work with the asset pipeline. 2011-08-29 08:52:14 -07:00
Chris Eppstein
e2960d81b0 Move callbacks to the configuration base class and make them work correctly with inherited data. 2011-08-28 12:58:08 -07:00
Chris Eppstein
5896711c8a Set a default value for the default_http_generated_images_path in rails 3.1 2011-08-28 12:55:57 -07:00
Chris Eppstein
d0bbb66e73 Add a generated-image-url helper for rails31 specifically 2011-08-28 12:54:52 -07:00
Chris Eppstein
02f268f1b1 Properly detect minimum rails31 version. 2011-08-28 10:47:09 -07:00
Chris Eppstein
7d743941d1 fix error message 2011-08-28 09:22:13 -07:00
Chris Eppstein
210a1d4771 only define the compass url helpers if they are not already defined. 2011-08-28 09:22:13 -07:00
Chris Eppstein
f23bf58e8d Add support for a separate output location for generated images. This is necessary for rails 3.1 support of sprites. 2011-08-20 17:24:03 -07:00
Scott Davis
8a407a6df7 Merge branch 'master' of github.com:chriseppstein/compass into rails31 2011-08-19 19:58:00 -04:00
Scott Davis
4187f88970 fixed a bug that was causeing compass to remove non sprite images 2011-08-19 19:55:55 -04:00
Chris Eppstein
000e4e1ed7 Merge branch 'master' into rails31
* 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
2011-08-19 14:42:42 -07:00
Scott Davis
1cdfab7c03 fixed horizontal height and width calculation 2011-08-12 15:34:04 -04:00
Scott Davis
4aa052d9e4 horizontal layout now respects positions and spacing correctly 2011-08-12 15:12:31 -04:00
Scott Davis
6a166d0145 derp double require 2011-08-02 23:46:03 -04:00
Scott Davis
59722ef4ad smart packing implimentation thanks @johnbintz 2011-08-02 23:36:20 -04:00
Scott Davis
87240723e7 smart packing helper classes 2011-08-02 23:35:27 -04:00
Scott Davis
08e92fadb2 layout for diagonal sprite 2011-08-02 22:08:27 -04:00
Scott Davis
acfd1e43a2 fixed trig functions closes #498 2011-08-02 18:49:06 -04:00
Scott Davis
289c452d64 patched image functions to accept a real path 2011-07-27 21:31:56 -04:00
Joeri Samson
ec7c4b2e9c Fix failing test for change to http_path in rails 2011-07-27 19:47:43 +02:00
Scott Davis
3a4d1e07b7 reverted sorting back to one liner 2011-07-27 03:01:28 -04:00
Scott Davis
8c48248a72 more importer tests 2011-07-27 02:39:24 -04:00
Scott Davis
0984b48b24 adjust spritmap class to usr load path to get relative sprite names 2011-07-27 02:11:45 -04:00
Scott Davis
71494cecfe rename sprite_search_path to sprite_load_path for consistancy 2011-07-26 17:53:56 -04:00
Scott Davis
5e89865192 fixed rails 3.0.x 2011-07-26 17:43:08 -04:00
Scott Davis
91a748a916 merge from master 2011-07-26 16:35:50 -04:00
Scott Davis
9c472b3c36 sprite_seach_path implimentation and test case 2011-07-26 16:21:59 -04:00
Scott Davis
9966421f58 configuration for sprite_search_path 2011-07-26 16:21:21 -04:00
Scott Davis
b581d2e1a7 passing tests for new vertical layout based on file size 2011-07-26 02:03:38 -04:00