github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Scott Davis 2012-01-31 12:04:03 -05:00
commit 05364e0a36
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc-src/content/help/tutorials/configuration-reference.markdown
View File

@ -255,7 +255,7 @@ later on.
<td style="vertical-align:top;">Hash </td> <td style="vertical-align:top;">Hash </td>
<td style="vertical-align:top;">These options are passed directly to the <td style="vertical-align:top;">These options are passed directly to the
Sass compiler. For more details on the format of sass options, please read the Sass compiler. For more details on the format of sass options, please read the
<a href="http://sass-lang.com/yardoc/SASS_REFERENCE.md.html#options">sass options documentation</a>. <a href="http://sass-lang.com/docs/yardoc/SASS_REFERENCE.md.html#options">sass options documentation</a>.
</td> </td>
</tr> </tr>
<tr> <tr>

2
doc-src/content/help/tutorials/contributing.markdown
View File

@ -202,7 +202,7 @@ will result:
4. Compass frameworks are not special. If compass can do it, so should an extension 4. Compass frameworks are not special. If compass can do it, so should an extension
be able. be able.
5. Sass is awesome -- Compass should make sass more accessible and 5. Sass is awesome -- Compass should make sass more accessible and
demonstrate how to use Sass to it's fullest potential. demonstrate how to use Sass to its fullest potential.
6. Developing across browsers is hard and will always be hard. It takes 6. Developing across browsers is hard and will always be hard. It takes
a community to get it right. a community to get it right.
7. By default, Compass supports as many browsers as it can. Where it can't 7. By default, Compass supports as many browsers as it can. Where it can't

3
lib/compass/commands/watch_project.rb
View File

@ -142,8 +142,7 @@ module Compass
compiler = new_compiler_instance(:quiet => true, :loud => [:identical, :overwrite, :create]) compiler = new_compiler_instance(:quiet => true, :loud => [:identical, :overwrite, :create])
if file = compiler.out_of_date? if file = compiler.out_of_date?
begin begin
puts ">>> Change detected to: #{relative || compiler.relative_stylesheet_name(file)}" puts ">>> Change detected at "+Time.now.strftime("%T")+" to: #{relative || compiler.relative_stylesheet_name(file)}
$stdout.flush
compiler.run compiler.run
GC.start GC.start
rescue StandardError => e rescue StandardError => e