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

877 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
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
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
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
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
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
addbc94716 Merge branch 'no_rails_integration' 2012-01-31 11:55:59 -05:00
Scott Davis
3d4ddca76a strip nils 2012-01-31 04:12:36 -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
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
Scott Davis
e4681e2672 fixed weird bug with data inheritance 2012-01-30 19:59:31 -05:00
Chris Eppstein
a6c045785d Allow some config attributes that are arrays to be inherited properly 
from inherited config data.
 2012-01-30 11:21:29 -08:00
Scott Davis
c3b0f0117a remove todo comment 2012-01-28 20:57:30 -05:00
Scott Davis
7d87a2eee8 strip .css from file names w/ test 2012-01-28 20:56:56 -05:00
Chris Eppstein
fc41c452b8 Don't set the quiet option unless disable_warnings is passed via the nested :sass options hash. 2012-01-28 16:25:04 -08:00
David Hidalgo
208c49af93 I added the time of scss change for control more efficiently of the last change 2012-01-26 15:16:26 +01:00
Scott Davis
4e50273fdb Merge branch 'master' into no_rails_integration 2012-01-18 20:05:58 -05:00
Scott Davis
3df5ba3369 merge stable 2012-01-18 19:55:24 -05:00
ShishKabab
317999bc4e Fix wrong degree to radian conversion in trig function. Might break some stylesheets for users so proceed with caution! 2012-01-08 13:54:58 +01:00
Scott Davis
bffba48375 fixed rouge puts 2012-01-06 14:21:05 -05:00
Scott Davis
7c8c0164b8 nuked merb 2012-01-06 14:05:34 -05:00
Scott Davis
b87dffb990 removed merb 2012-01-02 20:44:54 -05:00
Scott Davis
810a543400 Merge branch 'master' into no_rails_integration 2012-01-02 11:40:11 -05:00
Scott Davis
cf4805958d app integration 2012-01-02 11:27:20 -05:00
Scott Davis
a8e48c5a2a added support for --debug-info and --no-debug-info to compass compile 2012-01-02 02:49:38 -05:00
Scott Davis
f4dda8a5d0 added sprite_names sass function and test closes #620 2012-01-02 01:01:11 -05:00
Chris Eppstein
c4e9d00d61 Merge branch 'stable' 
Conflicts:
	VERSION.yml
	doc-src/content/CHANGELOG.markdown
	lib/compass/configuration/helpers.rb
	test/units/sass_extensions_test.rb
 2011-12-23 17:16:44 -08:00
Chris Eppstein
5138d5a187 Support for new versions of sass where the callback name changed. 2011-12-23 17:00:59 -08:00
Chris Eppstein
ca59adfa12 Add a new helper function to reject values from a list. 2011-12-23 16:53:48 -08:00
Chris Eppstein
fc46730b36 Fix broken tests. 2011-12-23 16:53:23 -08:00
Chris Eppstein
3110fc5d9e Support for new versions of sass where the callback name changed. 2011-12-23 16:23:14 -08:00
Scott Davis
16fff73ed7 removed rails tests and total rails itegration 2011-12-20 22:25:30 -05:00
Scott Davis
829d44f581 removed rails integration files 2011-12-20 21:54:07 -05:00
tka
b263bfdcaf if manifest_file not exists, discover :all 2011-12-20 02:28:00 +08:00
Scott Davis
57dcbad3ae Revert "bump sprite version for next release" 
This reverts commit 03f648d5c4.
 2011-12-13 18:17:24 -05:00
Scott Davis
1e74425e9b merge from stable 2011-12-13 18:16:12 -05:00
Scott Davis
03f648d5c4 bump sprite version for next release 2011-12-13 18:14:20 -05:00
Robert Vock
570ce43d96 remove less files, when cleaning up old sprites (fixes deleting to many generated sprites in some cases) 2011-12-13 22:56:54 +01:00
Scott Davis
7d22d3668c detecting rails was breaking features on traivis ci will investigate 2011-12-11 01:38:11 -05:00
Scott Davis
684ad8754a compass will now detect if your in a rails app and attempt to load its configuration from the application.rb if you are not using a compass configuration file 2011-12-10 15:13:29 -05:00