Commit Graph

770 Commits

Author SHA1 Message Date
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
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