github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,581 Commits 8 Branches 80 Tags 10 MiB
ba677ad5d2
Commit Graph

894 Commits

Author SHA1 Message Date
Chris Eppstein
28daff6771 Assert that sprite offsets are numbers. 2011-09-19 17:59:37 -07:00
Chris Eppstein
6b3b71ab37 Merge pull request #560 from johnbintz/rbx-sort-fix 
Rubinius/JRuby sort fix
 2011-09-19 12:31:39 -07:00
Chris Eppstein
bfcff75c32 Handle the case where the there is not relative path to the images directory. 2011-09-19 09:03:02 -07:00
Chris Eppstein
b5ca89425d code cleanup 2011-09-19 07:41:32 -07:00
Chris Eppstein
de029babb5 Slightly prettier output during sprite file generation. 2011-09-19 07:41:32 -07:00
Chris Eppstein
ce853df6bf In some cases changing the layout doesn't force the sprite hash to change, so we have to make the layout part of the hash. 2011-09-19 07:41:32 -07:00
Chris Eppstein
8b33471229 Bump sprite version for this release. 2011-09-19 07:41:32 -07:00
Chris Eppstein
cd907d17a7 Log the creation or unchanged status of sprites during compilation. 2011-09-19 07:41:31 -07:00
Chris Eppstein
5fd2c14d06 A better setting to check if we are precompiling 2011-09-18 08:57:05 -07:00
John Bintz
c9593794bd better sorting of images coming into sprites, fixes one rbx error 2011-09-17 12:02:51 -04:00
Chris Eppstein
fe4edff7d4 Workaround for the deprecated static_root 2011-09-17 07:44:20 -07: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
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
Chris Eppstein
2c1fcfcad7 Fix broken test cases 2011-07-19 11:44:24 -07:00
Scott Davis
98350c3e19 fixed a nil bug in the latest ruby 1.9.2 2011-07-19 12:32:26 -04:00
Chris Eppstein
0c1342746e Better configuration defaults for rails31 2011-07-18 22:00:06 -07:00
Chris Eppstein
5ac72d5b0a Merge branch 'stable' 
* stable:
  Version Bump.
  Update changelog for 0.11.5
  Reset only the block HTML elements #339
  fix warning logic in vertical-rhythms module

Conflicts:
	VERSION.yml
 2011-07-10 17:36:15 -07:00
Irina Dumitrascu
07819ccfbd Reset only the block HTML elements #339 
- used elements-of-type(html5-block) in all the reset stylesheets
  (instead of duplicate tag enumerations)
- removed dialog
- canvas is inline, not block

Closes GH-339, GH-462.
 2011-07-10 17:26:23 -07:00
Chris Eppstein
6c12749194 Merge branch 'stable' 
* stable:
  Fix failing test when updating to latest SASS
  Gemfile.lock should not be part of a library / gem
  fix typo
  Fix issue with parent directory references within the sass_path in the compass compiler.
  Version bump.
  Update changelog
  Return a non-zero exit code if there are any stylesheet compilation errors. Closes GH-432.
  Fix test failures.
  Better docs for the shadow mixins. Closes GH-433.
  Include the Compass logger to prevent "uninitialized constant Compass::Logger"
  Broken link fixed to what I think is the correct section of the SASS docs.
  grid-background vertical rhythm should be based off of $blueprint-font-size, rather than a static value.
  :focus should not use shorthand border property, since it only need to change the border-color
  update changelog
  Fix absolute path detection on Windows.
  Fix the mime type returned for svg images. Closes GH-442.

Conflicts:
	Gemfile.lock
 2011-07-03 14:21:09 -07:00
Chris Eppstein
539f206e51 Fix issue with parent directory references within the sass_path in the compass compiler. 
Closes GH-409.
 2011-07-03 10:45:33 -07:00
Chris Eppstein
b8b6af9d49 Return a non-zero exit code if there are any stylesheet compilation errors. Closes GH-432. 2011-07-03 00:18:58 -07:00
Matt Fawcett
b2b9d57505 Include the Compass logger to prevent "uninitialized constant Compass::Logger" 
Closes GH-438.
 2011-07-02 21:59:09 -07:00
Costin Bereveanu
3b18b72d64 Fix absolute path detection on Windows. 
Closes GH-451.
 2011-07-02 21:07:49 -07:00
Chris Eppstein
b7e66a7658 Fix the mime type returned for svg images. Closes GH-442. 2011-07-02 20:57:24 -07:00
Chris Eppstein
3786a8312a Merge branch 'stable' 
* stable:
  Fix edge case issue when there's no cache location.
  Fix broken test.
  Transitions accepting multiple transitions separated by commas
  Added force-wrap mixin to prevent URLs and long lines of text from breaking layouts.
 2011-07-02 18:05:32 -07:00
Chris Eppstein
ab270c1adb Fix edge case issue when there's no cache location. 2011-07-02 18:05:02 -07:00
Caged
a08d0319d0 Fixes #449. Accept and honor offsets in selectors 2011-07-02 13:27:32 -07:00
Chris Eppstein
f18b5bcbc1 Merge branch 'stable' 
* stable:
  Update CHANGELOG
  When the unit is in pixels, round down in the leader and up in the trailer.
  Ensure there is a minimum of padding in each line when calculating how many lines are needed.
  Support absolute font sizing in the vertical rhythm module
  Update homepage
  Adding the generated css files from the msfilter change
  Removing -ms-filter as it drives IE9+ crazy. plus existing filter works anyway for IE9-
  In case you want to buy stuff.
  Update Gemfile to use rake 0.8.7
  Handle pathnames being assigned to the working path of a command. Closes GH-434.
  Fix docs
  Fix compass version in the docs.

Conflicts:
	Gemfile.lock
 2011-07-01 22:23:05 -07:00
Scott Davis
dfb7c70113 merge 2011-06-27 01:07:53 -04:00
Scott Davis
642d0b2007 Merge branch 'stable' into rails31 2011-06-27 00:58:14 -04:00
Scott Davis
cc81fe6fac merged version.yml 2011-06-27 00:56:29 -04:00
Scott Davis
43868ecabd test files for horizontal sprites 2011-06-25 01:28:01 -04:00
Scott Davis
18c79f51a2 horizontal sprite layout 2011-06-25 01:23:50 -04:00
Scott Davis
8d2ad57e18 Thanks @ngauthier for spellchecking! 2011-06-23 06:32:41 -07:00
Chris Eppstein
852f033160 Handle pathnames being assigned to the working path of a command. 
Closes GH-434.
 2011-06-19 12:56:01 -07:00
Scott Davis
e0abb38e2f fixed problem with decimal math and being able to position sprites with "%"s fixes #415 2011-06-19 11:24:44 -04:00
Scott Davis
cfe5b8ed7e refactor 2011-06-15 23:37:23 -04:00
Scott Davis
dc504ecd8e pass new config options to chunky_png canvas on image save 2011-06-12 13:37:20 -04:00
Scott Davis
db74d8bdb3 new config option to pass options along to chunky_png 2011-06-12 13:36:49 -04:00
Chris Eppstein
2d81e0a506 Fix bug 2011-06-11 23:45:00 -07:00
Scott Davis
b9234e50d0 added test for sprite command and removed specs 2011-06-12 02:22:05 -04:00
Scott Davis
41bd992a8d fixed :sprite_generated callback its now passing along the canvas 2011-06-12 01:42:38 -04:00
Scott Davis
1f17603aea Merge branch 'stable' of github.com:chriseppstein/compass into stable 2011-06-12 01:38:42 -04:00
Scott Davis
cebe25a460 implimented engine in sprite_map 2011-06-12 01:37:21 -04:00
Scott Davis
80412b5c1d added engine to sprite_map 2011-06-12 01:35:50 -04:00
Scott Davis
b6cf4f5213 refactored engine to be a class and turned on best compression for chunky_png 2011-06-12 01:35:19 -04:00
Scott Davis
6f95c9d17a added canvas to engine 2011-06-12 01:34:33 -04:00
Chris Eppstein
39df74c55a Add a new command to clean up generated files 2011-06-11 22:28:38 -07:00
Chris Eppstein
2be7567bb2 Better error message when a sub command is missing. 2011-06-11 21:54:56 -07:00
Chris Eppstein
ab25ba0b40 Code cleanup 2011-06-11 21:54:32 -07:00
Chris Eppstein
c069babe76 log removal actions in the compiler output. 2011-06-11 21:54:12 -07:00
Scott Davis
7454e522a5 engine abstract 2011-06-12 00:52:36 -04:00
Scott Davis
a6ea065eaa split sprite map class into modules for easy reading it was way to long 2011-06-12 00:16:11 -04:00
Scott Davis
21a5a2ae3d sprite module files 2011-06-12 00:15:23 -04:00
Chris Eppstein
40e2f330e6 Merge remote-tracking branch 'pfeiffer/cache_busting' into stable 
* pfeiffer/cache_busting:
  Removing unneeded 'unquote' from tests
  Adding note about path based asset cache busting in to documentation
  Adding changelog entry
  Fix comments for asset_cache_buster
  Make asset_cache_buster return a hash with path and query, while still maintaining support for cache busting via query string if a string is returned.
  Extend cache busting to allow for path manipulation
 2011-06-11 17:37:55 -07:00
Chris Eppstein
5999c7ba6c Sass and compass both have :quiet options with different meanings. So we have to separate the options out. 2011-06-11 16:49:28 -07:00
Chris Eppstein
59a6d5706d Fix a bug in the importer string representation. 2011-06-11 13:47:59 -07:00
Chris Eppstein
ecd1efdea4 Fix for a compass validator bug due to some internal compass changes. 2011-06-11 11:33:01 -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
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
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
89869db09c cleaned up some over zelious cacheing that was causing inconsistancy problems 2011-06-09 16:02:16 -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
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
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
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
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
faba01f34c added failing test for issue #400 and fixed the callback typo closes #400 2011-05-25 11:44:13 -04: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
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
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
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
Mattias Pfeiffer
8661c481cf Fix comments for asset_cache_buster 2011-05-04 11:43:22 +02:00
Mattias Pfeiffer
2f3b757b46 Make asset_cache_buster return a hash with path and query, while still maintaining support for cache busting via query string if a string is returned. 2011-05-04 11:37:58 +02:00
Nathaniel Bibler
21928907e4 Extend cache busting to allow for path manipulation 2011-05-04 11:02:15 +02:00
Chris Eppstein
5ededce909 Add support for -ms gradients in background-image and background properties. 
Closes GH-361.
 2011-05-01 09:33:21 -07:00
Chris Eppstein
04a288ae8f Give a better error if Sass::Script::Functions.declare does not exist. 
Closes GH-365.
 2011-05-01 08:28:58 -07:00
Chris Eppstein
8527f5b91f A more robust approach to getting the git version. 2011-05-01 08:10:27 -07:00
Chris Eppstein
ea6e15b8a4 Handle homeless users. Closes GH-364. 2011-04-29 06:50:11 -07:00
Scott Davis
5a2967fe51 sprite test_unit 2011-04-28 02:50:14 -04:00
Chris Eppstein
144a3b27a1 Bump version and assign a name. 2011-04-24 22:21:10 -07:00
Chris Eppstein
28ccff0fba Make the generated configuration file a little more readable. 2011-04-24 20:04:03 -07:00