Commit Graph

2539 Commits

Author SHA1 Message Date
Chris Eppstein
bfba73c1e3 Ignore charset in blueprint files 2011-06-07 11:22:33 -07:00
Chris Eppstein
d80dde727a This file has utf-8 chars in the comments. 2011-06-07 11:10:39 -07:00
Chris Eppstein
0518f0d293 Fix encoding issue. 2011-06-07 11:10:27 -07:00
Chris Eppstein
275635a88f Merge branch 'master' into rails31
* master:
  Rename the sprite Base class to SpriteMap
  Move the sprite importer to the compass module and rename it to be more clear about what it does.
2011-06-07 07:55:54 -07:00
Chris Eppstein
008cffa3ef Rename the sprite Base class to SpriteMap 2011-06-07 07:51:47 -07:00
Chris Eppstein
c73d281e58 Move the sprite importer to the compass module and rename it to be more clear about what it does. 2011-06-06 18:53:35 -07:00
Chris Eppstein
b0e89239c3 Merge branch 'master' into rails31
* master:
  The compass watcher is in quiet mode except for important actions.
  Clear up a Logger class lookup issue that was reported.
  Following a similar API to how the Complier works, don't log anything (don't even load up the logger!) if we pass in the :quiet option.
  Previously, calling directory("/hi") would error, because options would remain nil if self doesn't respond_to?(:options)
  moved config check to perform
  added @chriseppsteins suggestion for issue #300
  forgot test files
  added failing test for issue #400 and fixed the callback typo closes #400
  move hashing and comparison methods into SpriteMap class
  removed unneeded file
  refactored the sass importer for sprites

Conflicts:
	lib/compass/sass_extensions/sprites/sprites.rb
2011-06-05 18:04:29 -07:00
Chris Eppstein
dc8d8cd765 The compass watcher is in quiet mode except for important actions. 2011-06-05 15:50:43 -07:00
Chris Eppstein
3bb88271e7 Clear up a Logger class lookup issue that was reported. 2011-06-05 15:48:11 -07:00
Chris Eppstein
52e41d0455 This file has utf-8 chars in the comments. 2011-06-03 15:29:47 -07:00
Chris Eppstein
1a84305a04 Fix encoding issue. 2011-06-03 15:06:02 -07:00
Chris Eppstein
1b689ce966 Basic Rails 3.1 integration. 2011-06-03 10:29:59 -07:00
Chris Eppstein
4852e7803c Fix a bug where import paths are added twice when using add_import_path in a configuration file. 2011-06-03 09:45:51 -07:00
Chris Eppstein
5681f38e50 Better string representation for the sprite importer. 2011-06-03 09:44:24 -07:00
Scott Davis
028f96131d Merge pull request #411 from bmaltzan/stable
typo: appliction
2011-06-01 09:03:12 -07:00
Brian Maltzan
10fb3814ca typo: appliction 2011-06-01 08:56:40 -07:00
Scott Davis
47ad8f17aa Merge pull request #407 from hcatlin/master
Actions should obey options[:quiet]
2011-05-30 12:25:29 -07:00
Darryl Pogue
23fc8290c0 Update test case for flexible box. 2011-05-30 11:33:55 -07:00
Hampton Catlin
3bf3ddac72 Following a similar API to how the Complier works, don't log
anything (don't even load up the logger!) if we pass in the :quiet option.

I need this because of some conflicts with Compass::Logger, being referred
to as "Logger", which seemed to be pulling out the main Logger. This is a
seperate issue, but making this options[:quiet] API functional is a nice
work-around that keeps things from getting too messy.

Tests included, obviously.
2011-05-30 16:17:28 +01:00
Hampton Catlin
9add993129 Previously, calling directory("/hi") would error, because
options would remain nil if self doesn't respond_to?(:options)

So, just double check we have something in options
2011-05-30 16:15:35 +01:00
Darryl Pogue
759692a618 Enable IE 10 support for flexible box with the -ms prefix. 2011-05-29 19:42:28 -07:00
Chris Eppstein
e31e62bdd9 Strong tags in the docs should be bold. 2011-05-28 02:11:30 -07:00
Scott Davis
bcc3000860 moved config check to perform 2011-05-26 15:00:54 -04:00
Scott Davis
d080fdddb7 added @chriseppsteins suggestion for issue #300 2011-05-26 14:42:24 -04:00
Scott Davis
b6ca6e4efb Merge branch 'master' of github.com:chriseppstein/compass into stable 2011-05-25 11:45:27 -04:00
Scott Davis
d95149ccff forgot test files 2011-05-25 11:44:53 -04:00
Scott Davis
faba01f34c added failing test for issue #400 and fixed the callback typo closes #400 2011-05-25 11:44:13 -04:00
lyuba
279124cc19 font styles in the @font-face 2011-05-22 01:32:34 +02:00
Scott Davis
6ba72b9533 move hashing and comparison methods into SpriteMap class 2011-05-12 23:44:21 -04:00
Scott Davis
2d797ba956 removed unneeded file 2011-05-12 23:38:57 -04:00
Scott Davis
eec6759649 refactored the sass importer for sprites 2011-05-12 23:36:59 -04:00
David Oliver
cb6068c9a3 Adding Micro Clearfix which is new and uses less CSS than PIE Clearfix 2011-05-12 23:07:54 +02:00
Scott Davis
9992a18a72 Merge branch 'master' of github.com:chriseppstein/compass into stable 2011-05-12 14:27:51 -04:00
Scott Davis
ef18040a0b typo 2011-05-11 23:22:17 -04:00
Scott Davis
d254f41696 updated sprite docs 2011-05-11 23:21:51 -04:00
Scott Davis
fc106cb379 adding creadit back I removed by mistake doing a git reset 2011-05-11 03:12:45 -04:00
Scott Davis
c83432d1c0 updated change log 2011-05-11 03:10:11 -04:00
Scott Davis
2f105f3696 made things less ambiguous 2011-05-11 02:45:26 -04:00
Scott Davis
fdd639efaf updated the regex to support nested files and refactored some unclear functions 2011-05-11 02:41:51 -04:00
Scott Davis
753ad37df7 Fixed problem with globs only going one directoy deep from now on imports like foo/*.png will get mapped to foo/**/*.png
Please enter the commit message for your changes. Lines starting
2011-05-10 22:44:10 -04:00
Scott Davis
369c8d636e forgot test files 2011-05-10 21:57:43 -04:00
Scott Davis
84d207f827 Sass Colors will no longer cause an error if you use them as sprite names. closes #381 2011-05-10 21:51:35 -04:00
Scott Davis
325306dcec Fixed and issue with the options keyword in the Sprite::Base class. it was casing the passed options to be reset to an empty hash. I renamed it to kwargs for consistancy. I also refactored my previous changes to be unobtrusive to people currently using the sprite-map function without an @import. 2011-05-10 21:04:57 -04:00
Scott Davis
80a6c90805 Revert "credit due on blog post"
This reverts commit 27d3aca067.
2011-05-10 19:22:45 -04:00
Scott Davis
4321fc0cf5 refactored to allow a per sprite cleanup 2011-05-10 19:20:38 -04:00
Scott Davis
6cb9bc2662 old sprites will now be removed by default 2011-05-10 18:02:32 -04:00
Scott Davis
8f675f936b moved test files to a more sain structure 2011-05-10 18:01:12 -04:00
Eric Meyer
27d3aca067 credit due on blog post 2011-05-09 18:34:33 -06:00
Eric Meyer
f12e92601c Merge branch 'stable' of github.com:chriseppstein/compass into stable 2011-05-09 13:14:26 -06:00
Eric Meyer
40d231948b updated author info for eric 2011-05-09 13:13:42 -06:00