Merge pull request #1 from LaurentGoderre/feature-grids

Resolved grids conflicts and removed unused local prettify

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 
-script:
-  - ant
+before_script: 
+  - ant test -Djshint.failbuild=true
 
-after_script: 
-  - ant test
+script:
+  - ant

README.md

@@ -36,7 +36,7 @@ The toolkit complies with the new Standards on Web Accessibility and Web Usabili
 * [Validate your CSS](http://jigsaw.w3.org/css-validator/#validate_by_uri+with_options) with the following changes to the default settings:
   * **Profile:** CSS level 3
   * **Vendor extensions:** Warnings
-* [Validate your JavaScript code](http://www.jshint.com) with the following changes to the default settings:
+* [Validate your JavaScript code](http://www.jshint.com) with the following change to the default settings:
   * **Warn - When code is not in strict mode:** false
 * Formatting recommendations:
   * Indent with tabs using the [K&R indenting style](http://en.wikipedia.org/wiki/Indent_style#K.26R_style)
@@ -85,7 +85,7 @@ La Boîte à outils est conforme à la Norme sur l'accessibilité des sites Web
 * [Valider votre CSS](http://jigsaw.w3.org/css-validator/validator.html.fr#validate_by_uri+with_options) en apportant les changements suivants aux paramètres par défaut :
   * **Profil :** CSS niveau 3
   * **Extensions Proprétaires :** Avertissements
-* [Valider votre code JavaScript](http://www.jshint.com) en apportant les changements suivants aux paramètres par défaut :
+* [Valider votre code JavaScript](http://www.jshint.com) en apportant le changement suivant aux paramètres par défaut :
   * **Warn - When code is not in strict mode:** false
 * Recommandations quant au formatage :
   * Ajouter les tabulations en utilisant le [style d'indentation K&R](http://fr.wikipedia.org/wiki/Style_d%27indentation#Style_K.26R)

build/build-tasks.properties

@@ -16,4 +16,5 @@ jruby.jar=${lib.dir}/jruby.jar
 
 #JSLint
 jshint.jar=${lib.dir}/ant-jshint-0.3.1-deps.jar
-jshint.globals.file=${tasks.basedir}/jshint.globals.properties
+jshint.globals.file=${tasks.basedir}/jshint.globals.properties
+jshint.failbuild=false

build/build-tasks.xml

@@ -42,17 +42,16 @@
 		</fileset>
 	</path>
 
-	<!-- Include jruby + gems (compass + sass + zengrids) -->
+	<!-- Include jruby + gems (compass + sass) -->
 	<target name="-build-jruby" depends="-jruby.jar.check" unless="jruby.jar.exists">
 		<mkdir dir="${lib.dir}/jruby-compiled" />
 		<get src="http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-complete-1.6.7.2.jar" dest="${lib.dir}/jruby.jar"/>
 		<get src="http://production.cf.rubygems.org/gems/sass-3.1.19.gem" dest="${lib.dir}/jruby-compiled/sass.gem"/>
 		<get src="http://production.cf.rubygems.org/gems/chunky_png-1.2.5.gem" dest="${lib.dir}/jruby-compiled/chunky_png.gem"/>
 		<get src="http://production.cf.rubygems.org/gems/fssm-0.2.9.gem" dest="${lib.dir}/jruby-compiled/fssm.gem"/>
 		<get src="http://production.cf.rubygems.org/gems/compass-0.12.1.gem" dest="${lib.dir}/jruby-compiled/compass.gem"/>
-		<get src="http://production.cf.rubygems.org/gems/zen-grids-1.2.gem" dest="${lib.dir}/jruby-compiled/zen-grids.gem"/>
 		<java jar="${lib.dir}/jruby.jar" fork="true">
-			<arg line="-S gem install -i &quot;${lib.dir}/vendors&quot; &quot;${lib.dir}/jruby-compiled/sass.gem&quot; &quot;${lib.dir}/jruby-compiled/chunky_png.gem&quot; &quot;${lib.dir}/jruby-compiled/fssm.gem&quot; &quot;${lib.dir}/jruby-compiled/compass.gem&quot; &quot;${lib.dir}/jruby-compiled/zen-grids.gem&quot;"/>
+			<arg line="-S gem install -i &quot;${lib.dir}/vendors&quot; &quot;${lib.dir}/jruby-compiled/sass.gem&quot; &quot;${lib.dir}/jruby-compiled/chunky_png.gem&quot; &quot;${lib.dir}/jruby-compiled/fssm.gem&quot; &quot;${lib.dir}/jruby-compiled/compass.gem&quot;"/>
 		</java>
 		<exec executable="jar" dir="${lib.dir}/">
 		  <arg line="-uf jruby.jar -C vendors ." />
@@ -91,7 +90,7 @@
 	</target>
 
 	<target name="-jshint">
-		<jshint dir="${src.dir}" fail="false" globalsFile="${jshint.globals.file}">
+		<jshint dir="${src.dir}" fail="${jshint.failbuild}" globalsFile="${jshint.globals.file}">
 			<report type="xml" destfile="${build.dir}/jshint.out.xml" />
 			<include name="**/*.js"/>
 			<exclude name="**/*.min.js"/>

build/compile.rb

@@ -7,7 +7,6 @@
 require 'rubygems'   
 require 'compass'  
 require 'compass/exec'
-require 'zen-grids'
 
 # Run Compass + Gems!
 exit Compass::Exec::SubCommandUI.new([ARGV[1], ARGV[2], "-c" + File.join(File.dirname(__FILE__), 'config.rb'),"-q"]).run!

build/js/dependencies/equalheights-min.js

@@ -1,17 +1,17 @@
 /*!-------------------------------------------------------------------- 
- * JQuery Plugin: "EqualHeights"
- * by:    Scott Jehl, Todd Parker, Maggie Costello Wachs (http://www.filamentgroup.com)
- *
- * Copyright (c) 2008 Filament Group
- * Licensed under GPL (http://www.opensource.org/licenses/gpl-license.php)
- *
- * Description: Compares the heights or widths of the top-level children of a provided element 
-		and sets their min-height to the tallest height (or width to widest width). Sets in em units 
-		by default if pxToEm() method is available.
- * Dependencies: jQuery library, pxToEm method	(article: 
-		http://www.filamentgroup.com/lab/retaining_scalable_interfaces_with_pixel_to_em_conversion/)							  
- * Usage Example: $(element).equalHeights();
-		Optional: to set min-height in px, pass a true argument: $(element).equalHeights(true);
- * Version: 2.0, 08.01.2008
+* JQuery Plugin: "EqualHeights"
+* by:    Scott Jehl, Todd Parker, Maggie Costello Wachs (http://www.filamentgroup.com)
+*
+* Copyright (c) 2008 Filament Group
+* Licensed under GPL (http://www.opensource.org/licenses/gpl-license.php)
+*
+* Description: Compares the heights or widths of the top-level children of a provided element 
+and sets their min-height to the tallest height (or width to widest width). Sets in em units 
+by default if pxToEm() method is available.
+* Dependencies: jQuery library, pxToEm method	(article: 
+http://www.filamentgroup.com/lab/retaining_scalable_interfaces_with_pixel_to_em_conversion/)
+* Usage Example: $(element).equalHeights();
+Optional: to set min-height in px, pass a true argument: $(element).equalHeights(true);
+* Version: 2.0, 08.01.2008
 --------------------------------------------------------------------*/
 (function(a){a.fn.equalHeights=function(b){a(this).each(function(){var c=0;a(this).children().each(function(){if(a(this).height()>c){c=a(this).height()}});if(!b&&typeof Number.prototype.pxToEm!=="undefined"){c=c.pxToEm()}if(a.browser.msie&&a.browser.version==="6.0"){a(this).children().css({height:c})}a(this).children().css({"min-height":c})});return this}}(jQuery));