Commit Graph

757 Commits

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