Commit Graph

2180 Commits

Author SHA1 Message Date
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
a82a3dd5d4 updated change log 2011-08-19 17:04:32 -04: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
Tyrinslys Valinlore
d8e43bfdd7 Changed the descriptions of the sin, cos, and tan to be more descriptive. 2011-08-03 11:28:59 -04:00
Scott Davis
6a166d0145 derp double require 2011-08-02 23:46:03 -04:00
Scott Davis
e49581c18f smart pack docs - forgot something 2011-08-02 23:37:59 -04:00
Scott Davis
590123aeba smart pack docs 2011-08-02 23:37:31 -04:00
Scott Davis
59722ef4ad smart packing implimentation thanks @johnbintz 2011-08-02 23:36:20 -04:00
Scott Davis
ef4c897de5 tests for smart packing 2011-08-02 23:35:53 -04:00
Scott Davis
87240723e7 smart packing helper classes 2011-08-02 23:35:27 -04:00
Scott Davis
d4227346af new tests 2011-08-02 23:34:59 -04:00
Scott Davis
5f2cf884b6 docs for diagonal layout 2011-08-02 22:13:13 -04:00
Scott Davis
08e92fadb2 layout for diagonal sprite 2011-08-02 22:08:27 -04:00
Scott Davis
26b2d1fcba added test for diagonal layout 2011-08-02 22:08:05 -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
Joeri Samson
b57822c134 Failing test for changing http_path with rails 2011-07-27 19:47:42 +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
c950d87432 abstracted out test helpers 2011-07-26 16:20:51 -04:00
Scott Davis
1ad4dcaae8 hoping this fixes the ci server issues 2011-07-26 15:11:52 -04:00
Scott Davis
3f72a549d3 fixed sprite hash in features 2011-07-26 14:59:08 -04:00
Scott Davis
387a2ffe1f fixed features to be more lieniet on sprite hashes 2011-07-26 14:42:57 -04:00
Scott Davis
64d0787ce2 Merge branch 'stable' 2011-07-26 14:02:00 -04:00
Scott Davis
ac43297822 merged lyuba stable 2011-07-26 14:01:51 -04:00
Scott Davis
8f482da5db merge 2011-07-26 02:30:47 -04:00
Scott Davis
40f96b94b0 Merge branch 'stable' of github.com:chriseppstein/compass 2011-07-26 02:25:56 -04:00
Scott Davis
cdf11d7002 Merge pull request #485 from adamnbowen/patch-1
trivial documentation change
2011-07-25 23:24:42 -07:00
Scott Davis
c79e997098 merged in stable and added a test image 2011-07-26 02:08:29 -04:00
Scott Davis
b78bb69674 Merge branch 'stable' of github.com:chriseppstein/compass 2011-07-26 02:07:54 -04:00
Scott Davis
0de35e6d2b Merge pull request #479 from dbussink/stable
Use more lenient timing, fixes feature on Rubinius
2011-07-25 23:07:08 -07:00
Scott Davis
b581d2e1a7 passing tests for new vertical layout based on file size 2011-07-26 02:03:38 -04:00
Scott Davis
7a183754b7 merge 454 closes 454 2011-07-25 23:05:37 -04:00
Scott Davis
38cf0e571b merge 2011-07-25 22:47:29 -04:00
Chris Eppstein
33263caffe Don't nuke the css files due to config changes during rails boot unless compilation is enabled. 2011-07-22 10:55:06 -07:00
Scott Davis
b1b6273b3f docs for horizontal spriting 2011-07-21 13:07:32 -04:00
Adam Bowen
84e3746325 "to the right" doesn't make sense with how the page is laid out
"listed below the display value" is a bit more relevant to the current documentation layout
2011-07-20 16:05:47 -07:00
Chris Eppstein
2c1fcfcad7 Fix broken test cases 2011-07-19 11:44:24 -07:00