Merge branch 'master' of github.com:koenbok/Framer

koenbok · May 21, 2013 · 3d6b2d5 · 3d6b2d5
2 parents ee67a19 + bdc7447
commit 3d6b2d5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -16,4 +16,8 @@ To run the tests run `make test` or `make testw` to keep watching and test on fi
 
 ### Contributing
 
-We love contributions. If you like to help out and need ideas what to work on send me a [message](mailto:koen+framer@madebysofa.com).
+We love contributions. If you like to help out and need ideas what to work on send me a [message](mailto:koen+framer@madebysofa.com).
+
+wercker build status:
+
+[![Wercker status](https://app.wercker.com/status/8e5d02248bfd387acebdf177fba5f6b1)](https://app.wercker.com/project/bykey/8e5d02248bfd387acebdf177fba5f6b1)
diff --git a/src/animation.coffee b/src/animation.coffee
@@ -187,7 +187,7 @@ class Animation extends EventEmitter
 				-webkit-animation-name: #{@animationName};
 				-webkit-animation-timing-function: linear;
 				-webkit-animation-fill-mode: both;
-				-webkit-tranform-origin: #{@origin};
+				-webkit-transform-origin: #{@origin};
 				-webkit-backface-visibility: #{backsideVisibility};
 			}"
 

diff --git a/template/icon/apple-touch-icon-114x114-precomposed.png b/template/icon/apple-touch-icon-114x114-precomposed.png
diff --git a/template/icon/apple-touch-icon-144x144-precomposed.png b/template/icon/apple-touch-icon-144x144-precomposed.png
diff --git a/template/icon/apple-touch-icon-72x72-precomposed.png b/template/icon/apple-touch-icon-72x72-precomposed.png
diff --git a/template/icon/apple-touch-icon-precomposed.png b/template/icon/apple-touch-icon-precomposed.png
diff --git a/template/index.html b/template/index.html
@@ -2,14 +2,19 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		
+
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<meta name="format-detection" content="telephone=no">
 		<meta name="viewport" content="width=640,initial-scale=0.5,user-scalable=no">
-
+
+		<link rel="apple-touch-icon-precomposed" sizes="144x144" href="icon/apple-touch-icon-144x144-precomposed.png">
+		<link rel="apple-touch-icon-precomposed" sizes="114x114" href="icon/apple-touch-icon-114x114-precomposed.png">
+		<link rel="apple-touch-icon-precomposed" sizes="72x72" href="icon/apple-touch-icon-72x72-precomposed.png">
+		<link rel="apple-touch-icon-precomposed" href="icon/apple-touch-icon-precomposed.png">
+
 		<style type="text/css" media="screen">
-		
+
 		* {
 			margin:0;
 			padding:0;
@@ -18,19 +23,19 @@
 		}
 
 		body {
-			background: black url('checker-pattern.png') 
+			background: black url('checker-pattern.png')
 				repeat scroll top left;
 			font: 28px/1em "Helvetica";
 			color: #FFF;
 			-webkit-tap-highlight-color: rgba(0,0,0,0)
 		}
-		
+
 		a {
 			color: #bfbfbf;
 		}
-		
+
 		</style>
-		
+
 	</head>
 	<body>
 		<script src="framer.js"></script>