Commit Graph

2217 Commits

Author SHA1 Message Date
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
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
Eric Meyer
f4d1a8255c changelog for user-select 2011-09-12 14:18:15 -06:00
Eric Meyer
aef3c5a07e Merge branch 'stable' of github.com:chriseppstein/compass into stable 2011-09-12 14:04:24 -06:00
Chris Eppstein
93811a66c4 Merge pull request #548 from brikou/patch-1
removed useless unit
2011-09-11 23:45:00 -07:00
Brikou CARRE
a8ff39a8e4 removed useless unit 2011-09-12 09:34:45 +03: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
Scott Davis
0667ccf89c true not false 2011-09-06 22:50:50 -04:00
Scott Davis
16bbc81763 broke out sprite docs to be less complex 2011-09-06 22:39:31 -04:00
Scott Davis
e95ba13082 new sprite tutorials 2011-09-06 22:37:43 -04:00
Scott Davis
8ccdab41cc refactored for cleanliness 2011-09-06 15:48:10 -04:00
Scott Davis
b7f44a48d3 sprite layout tutorial 2011-09-03 16:32:57 -04:00
Scott Davis
8ae841785a updated gemfile so rcov will only install with mri_18 2011-09-03 15:57:25 -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
Scott Davis
c7c007672f refactored docs to use latest nanoc and extracted styles to compass-theme gem 2011-09-03 00:38:11 -04:00
Chris Eppstein
374aed6783 Merge pull request #523 from lloydk/master
Compass does not work with Rails 3.1 and the asset pipeline disabled
2011-08-30 21:00:58 -07:00
Lloyd Kupchanko
375c08b60e Fix for issue #522 2011-08-30 21:39:02 -06:00
Scott Davis
7733f21dd0 another typo 2011-08-30 11:13:25 -03:00
Scott Davis
fe7bbdd84b fixed a typo 2011-08-30 11:12:29 -03:00
Chris Eppstein
2fea4c105d Fix stupid 0 in version 2011-08-30 00:17:49 -07:00
Chris Eppstein
89c44698ac update changelog 2011-08-30 00:05:13 -07: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
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
Eric Meyer
d0067d7122 user-select mixin with docs and tests 2011-08-08 23:04:24 -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