Merge branch 'release/1.3' into develop

jakearchibald · Jul 25, 2011 · 0d5970f · 0d5970f
2 parents 6031827 + 9826279
commit 0d5970f
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,12 @@ Currently available online for you to use at http://spritecow.com
 Changes
 =======
 
+v1.2 2011-07-25
+---------------
+
+* FIX: Bits of CSS & JS that stopped things working in Opera
+* FIX: Bits of CSS & JS that stopped things working in IE10 (some remaining layout issues though)
+
 v1.2 2011-07-20
 ---------------
 

diff --git a/bin/compress_assets.sh b/bin/compress_assets.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-ver=3
+ver=4
 cat www/assets/$ver/script/{jquery-1.6.2,jquery.easing,jquery.transition,jquery.fileClickjack,intro,MicroEvent,Rect,ImgInput,SpriteCanvas,SpriteCanvasView,CssOutput,Toolbar,pageLayout,FeatureTest,featureTests,base}.js | bin/uglify/bin/uglifyjs --unsafe -o www/assets/$ver/script/mainmin.js
 cat www/assets/$ver/style/base.css | java -jar bin/yuicompressor-2.4.5.jar --type css -o www/assets/$ver/style/mainmin.css
diff --git a/www/assets/3/script/mainmin.js b/www/assets/3/script/mainmin.js
diff --git a/www/assets/3/style/mainmin.css b/www/assets/3/style/mainmin.css
diff --git a/www/assets/3/script/CssOutput.js → www/assets/4/script/CssOutput.js b/www/assets/3/script/CssOutput.js → www/assets/4/script/CssOutput.js
diff --git a/www/assets/3/script/FeatureTest.js → www/assets/4/script/FeatureTest.js b/www/assets/3/script/FeatureTest.js → www/assets/4/script/FeatureTest.js
diff --git a/www/assets/3/script/ImgInput.js → www/assets/4/script/ImgInput.js b/www/assets/3/script/ImgInput.js → www/assets/4/script/ImgInput.js
diff --git a/www/assets/3/script/MicroEvent.js → www/assets/4/script/MicroEvent.js b/www/assets/3/script/MicroEvent.js → www/assets/4/script/MicroEvent.js
diff --git a/www/assets/3/script/Rect.js → www/assets/4/script/Rect.js b/www/assets/3/script/Rect.js → www/assets/4/script/Rect.js
diff --git a/www/assets/3/script/SpriteCanvas.js → www/assets/4/script/SpriteCanvas.js b/www/assets/3/script/SpriteCanvas.js → www/assets/4/script/SpriteCanvas.js
diff --git a/www/assets/3/script/SpriteCanvasView.js → www/assets/4/script/SpriteCanvasView.js b/www/assets/3/script/SpriteCanvasView.js → www/assets/4/script/SpriteCanvasView.js
diff --git a/www/assets/3/script/Toolbar.js → www/assets/4/script/Toolbar.js b/www/assets/3/script/Toolbar.js → www/assets/4/script/Toolbar.js
diff --git a/www/assets/3/script/base.js → www/assets/4/script/base.js b/www/assets/3/script/base.js → www/assets/4/script/base.js
diff --git a/www/assets/3/script/featureTests.js → www/assets/4/script/featureTests.js b/www/assets/3/script/featureTests.js → www/assets/4/script/featureTests.js
diff --git a/www/assets/3/script/intro.js → www/assets/4/script/intro.js b/www/assets/3/script/intro.js → www/assets/4/script/intro.js
diff --git a/www/assets/3/script/jquery-1.6.2.js → www/assets/4/script/jquery-1.6.2.js b/www/assets/3/script/jquery-1.6.2.js → www/assets/4/script/jquery-1.6.2.js
diff --git a/www/assets/3/script/jquery.easing.js → www/assets/4/script/jquery.easing.js b/www/assets/3/script/jquery.easing.js → www/assets/4/script/jquery.easing.js
diff --git a/www/assets/3/script/jquery.fileClickjack.js → www/assets/4/script/jquery.fileClickjack.js b/www/assets/3/script/jquery.fileClickjack.js → www/assets/4/script/jquery.fileClickjack.js
diff --git a/www/assets/3/script/jquery.transition.js → www/assets/4/script/jquery.transition.js b/www/assets/3/script/jquery.transition.js → www/assets/4/script/jquery.transition.js
diff --git a/www/assets/4/script/mainmin.js b/www/assets/4/script/mainmin.js
diff --git a/www/assets/3/script/pageLayout.js → www/assets/4/script/pageLayout.js b/www/assets/3/script/pageLayout.js → www/assets/4/script/pageLayout.js
diff --git a/www/assets/3/style/base.css → www/assets/4/style/base.css b/www/assets/3/style/base.css → www/assets/4/style/base.css
diff --git a/www/assets/3/style/fonts/pro.ttf → www/assets/4/style/fonts/pro.ttf b/www/assets/3/style/fonts/pro.ttf → www/assets/4/style/fonts/pro.ttf
diff --git a/www/assets/3/style/fonts/pro.woff → www/assets/4/style/fonts/pro.woff b/www/assets/3/style/fonts/pro.woff → www/assets/4/style/fonts/pro.woff
diff --git a/www/assets/3/style/imgs/grid.png → www/assets/4/style/imgs/grid.png b/www/assets/3/style/imgs/grid.png → www/assets/4/style/imgs/grid.png
diff --git a/www/assets/3/style/imgs/sprites1.png → www/assets/4/style/imgs/sprites1.png b/www/assets/3/style/imgs/sprites1.png → www/assets/4/style/imgs/sprites1.png
diff --git a/www/assets/3/style/imgs/trans.png → www/assets/4/style/imgs/trans.png b/www/assets/3/style/imgs/trans.png → www/assets/4/style/imgs/trans.png