Commit Graph

2004 Commits

Author SHA1 Message Date
Chris Eppstein
696d84562d Track rails branch as a different version state. 2011-06-10 16:00:56 -07:00
Chris Eppstein
ba5bec3e09 Merge branch 'master' into rails31
* master:
  Prepare the next release version
  Fix CSS3 background attribute
  Version Bump & Prepare for v0.11.2
  Strong tags in the docs should be bold.
  Fixes sprites file names with sprockets, modifies tests accordingly to new structure.
  removed all cacheing from importer class it causes more problems then it was worth
  gemfile
  removed another instance cache in the importer that could be problematic
  updated importer to validate that sprites are png files
  run bundle exec when running tests
  cleaned up some over zelious cacheing that was causing inconsistancy problems
  added test for sprite importer
  removed unneeded cache
  readded mtime to importer class
  typo: appliction
  Update test case for flexible box.
  Enable IE 10 support for flexible box with the -ms prefix.
2011-06-10 16:00:04 -07:00
Chris Eppstein
69cf947cab Prepare the next release version 2011-06-10 15:59:38 -07:00
Chris Eppstein
3473e7d63a Merge branch 'stable'
* stable:
  Version Bump & Prepare for v0.11.2
  Strong tags in the docs should be bold.
  typo: appliction
  Update test case for flexible box.
  Enable IE 10 support for flexible box with the -ms prefix.
2011-06-10 15:56:46 -07:00
Chris Eppstein
00195296b8 Merge pull request #405 from dpogue/patch-1
Enable IE 10 support for flexible box with the -ms prefix.
2011-06-10 15:43:41 -07:00
Chris Eppstein
b6bec9ad62 Merge pull request #424 from tashian/master
Just a one-line doc fix of the CSS3 background attribute
2011-06-10 15:42:48 -07:00
tashian
60680769ca Fix CSS3 background attribute 2011-06-10 11:31:30 -07:00
Chris Eppstein
e2966fa78d Version Bump & Prepare for v0.11.2 2011-06-10 09:39:39 -07:00
Chris Eppstein
15412a756c Strong tags in the docs should be bold. 2011-06-10 09:35:07 -07:00
Scott Davis
9dcbbee3af Merge pull request #423 from kuroir/master
Fixes Sprites
2011-06-10 05:34:54 -07:00
Mario Kuroir Ricalde
333240de35 Fixes sprites file names with sprockets, modifies tests accordingly to new structure. 2011-06-10 05:11:28 -05:00
Scott Davis
4461f1be5f removed all cacheing from importer class it causes more problems then it was worth 2011-06-09 16:37:50 -04:00
Scott Davis
5138c94ec4 gemfile 2011-06-09 16:29:03 -04:00
Scott Davis
f248c22ab1 removed another instance cache in the importer that could be problematic 2011-06-09 16:28:10 -04:00
Scott Davis
ab5d6e51d9 updated importer to validate that sprites are png files 2011-06-09 16:27:23 -04:00
Scott Davis
7ff9ff15d0 run bundle exec when running tests 2011-06-09 16:03:58 -04:00
Scott Davis
89869db09c cleaned up some over zelious cacheing that was causing inconsistancy problems 2011-06-09 16:02:16 -04:00
Scott Davis
eb4870b685 Merge branch 'master' of github.com:chriseppstein/compass 2011-06-09 15:44:46 -04:00
Scott Davis
fc7fd8b6b4 added test for sprite importer 2011-06-09 15:44:35 -04:00
Scott Davis
b8811780ef removed unneeded cache 2011-06-09 15:44:10 -04:00
Scott Davis
7e583e5f58 readded mtime to importer class 2011-06-09 15:43:38 -04:00
Chris Eppstein
24ed97d920 Merge branch 'master' into rails31
* master:
  Revert "Disable 1.8.7 and rbx for now."
  Ignore charset in blueprint files
  This file has utf-8 chars in the comments.
  Fix encoding issue.
2011-06-07 11:23:33 -07:00
Chris Eppstein
f49120c1c8 Revert "Disable 1.8.7 and rbx for now."
This reverts commit 7d90dfe4a0.
2011-06-07 11:23:06 -07:00
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