Commit Graph

2489 Commits

Author SHA1 Message Date
Chris Eppstein
b8c0928f86 Merge branch 'stable'
Conflicts:
	doc-src/content/CHANGELOG.markdown
	lib/compass/commands/watch_project.rb
2012-03-05 11:30:52 -08:00
Chris Eppstein
6a89268404 Whitespace 2012-03-04 17:46:27 -08:00
Chris Eppstein
fe1c465482 Missing quote. 2012-03-03 09:36:05 -08:00
Scott Davis
9b39b5707f removed unneeded timecop 2012-03-01 13:48:34 -05:00
Chris Eppstein
63250a9075 Merge pull request #744 from nickcooley/stable
Issue #707 - Fix link in documentation.
2012-02-28 16:50:19 -08:00
Nick Cooley
c36e3843eb Issue #707
updated link to "http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials"
2012-02-28 19:18:47 -05:00
Chris Eppstein
06af286c4a Add filesize to the compass stats output. 2012-02-26 17:34:44 -08:00
Chris Eppstein
fee53b1a60 Handle the transparent keyword identifier in gradients.
Closes GH-356
2012-02-26 17:34:44 -08:00
Chris Eppstein
001fa41142 fix broken test 2012-02-26 17:34:44 -08:00
Scott Davis
ef1d39952c Merge pull request #736 from ry5n/master
Fix link to partials in docs (help/tutorials/best_practices)
2012-02-25 18:31:58 -08:00
Ryan Frederick
eec7b438e6 Fix link to partials in docs (help/tutorials/best_practices) 2012-02-25 12:30:20 -08:00
Scott Davis
ece75ff49c Merge pull request #729 from cosmic/load_sprites_base
Load sprites base
2012-02-25 10:37:14 -08:00
Scott Davis
9a3cbbe470 Merge pull request #730 from roytomeij/stable
Fix typo and use periods more consistently on the "contributing" page
2012-02-25 10:36:23 -08:00
Roy Tomeij
0dae5b5668 Fix typo and use periods more consistently 2012-02-21 21:34:20 +01:00
Sunny Ripert
52065da5d4 When @importing "compass/utilities/sprites" also load "sprites/base" 2012-02-21 18:06:05 +01:00
Scott Davis
e437f405b6 Merge pull request #721 from naehrstoff/patch-1
Fixed syntax error in Growl example code so it runs on copy and paste.
2012-02-15 05:01:24 -08:00
Peter Gassner
a3bc6b4c63 Fixed syntax error in Growl example code so it runs on copy and paste. 2012-02-15 07:53:54 +01:00
Scott Davis
734f2a6f33 Merge pull request #714 from dmattes/patch-1
typo: replace inline-block-link through inline-block-list
2012-02-14 08:29:55 -08:00
Scott Davis
ecb3f38a8f Merge pull request #717 from nathggns/master
Fix 404 links.
2012-02-14 08:29:26 -08:00
Nathaniel Higgins
75df388aef Fix links in spriting that result in 404s 2012-02-14 01:59:28 +00:00
Daniel Mattes
133418524d typo: replace inline-block-link through inline-block-list 2012-02-13 11:54:38 +01:00
Scott Davis
bbdb179df1 Revert "Merge pull request #712 from Xananax/sprite_background_image"
This reverts commit 0c208d58fa, reversing
changes made to c81af69c69.
2012-02-09 19:50:20 -05:00
Scott Davis
0c208d58fa Merge pull request #712 from Xananax/sprite_background_image
Sprite background image
2012-02-09 14:00:22 -08:00
Xananax
205f059adb Changed the background property into
background-image property in order
to allow one to set a background-color;
previously, background-color was
overriden by the background style.
Also added background-repeat property.
2012-02-09 15:29:52 +02:00
Xananax
234304d713 updated sprite tests to reflect property
background to background-image change
2012-02-09 15:28:04 +02:00
Scott Davis
c81af69c69 Merge pull request #706 from hcatlin/master
Documentation Tweak
2012-02-08 08:36:09 -08:00
Hampton Catlin
6cca0c4852 small documentation change to 3d transforms. referenced here: http://css3.bradshawenterprises.com/support/ 2012-02-06 13:52:06 -08:00
Scott Davis
99c1d372d7 version bump 2012-02-02 17:29:11 -05:00
Chris Eppstein
87e57cf6ea Upgrade notifications for compass rails users to use the compass-rails gem. 2012-02-02 13:59:20 -08:00
Scott Davis
c403ac9035 Merge branch 'master' of github.com:chriseppstein/compass 2012-01-31 12:07:58 -05:00
Scott Davis
2c42399725 fixed test 2012-01-31 12:07:38 -05:00
Scott Davis
ea677274a4 rogue quote 2012-01-31 12:05:52 -05:00
Scott Davis
05364e0a36 merge 2012-01-31 12:04:03 -05:00
Chris Eppstein
050e45d2fc Add img to the inline-block display type for elements-of-type(). 2012-01-31 09:01:50 -08:00
Scott Davis
fedc4fa47c fixed version 2012-01-31 11:58:50 -05:00
Scott Davis
addbc94716 Merge branch 'no_rails_integration' 2012-01-31 11:55:59 -05:00
Scott Davis
e7332268f3 Merge branch 'no_rails_integration' of github.com:chriseppstein/compass into no_rails_integration 2012-01-31 11:29:50 -05:00
Scott Davis
5cd4136676 fixed problem with path and ree/1.8.7 in test case 2012-01-31 11:29:39 -05:00
Chris Eppstein
144ae4f672 Compass 0.12 blog post 2012-01-31 08:03:12 -08:00
Scott Davis
3d4ddca76a strip nils 2012-01-31 04:12:36 -05:00
Scott Davis
0e74efb13e change version 2012-01-31 04:03:22 -05:00
Chris Eppstein
cef86e2bbc Account for the fact that ruby 1.8 returns strings from the local_variables method. 2012-01-30 21:26:57 -08:00
Jannis Leidel
ff51850b90 Flush stdout buffer to make sure the stdout message show up correctly. 2012-01-30 21:09:51 -08:00
Chris Eppstein
e3d50c19e5 Merge commit 'bac8667fb4d0103b975dacc261ed1da08f455e49' into no_rails_integration 2012-01-30 21:07:10 -08:00
Scott Davis
097c88dc45 Merge branch 'no_rails_integration' of github.com:chriseppstein/compass into no_rails_integration 2012-01-30 22:32:41 -05:00
Scott Davis
f11e5a3205 refactored the previous change 2012-01-30 22:32:05 -05:00
Scott Davis
7198a69909 sprite importer will now error if it does not find the associated glob 2012-01-30 22:12:01 -05:00
Scott Davis
11cf736066 fixed bug where application integrations would not load if there was a config file 2012-01-30 22:11:34 -05:00
Chris Eppstein
ee1adf9535 Update the madlib for compass 0.12 and compass-rails. 2012-01-30 18:57:17 -08:00
Scott Davis
e4681e2672 fixed weird bug with data inheritance 2012-01-30 19:59:31 -05:00