Merge branch 'twitter-cards-marketing' into gh-pages

Conflicts: cache.appcache

Merge branch 'twitter-cards-marketing' into gh-pages
Conflicts: cache.appcache
0fc43545 · Mikhail Novikov · 96bc88a7 · 00b1f13e · 0fc43545 · 0fc43545
隐藏空白更改
内联并排

Showing with 20 addition and 3 deletion

cache.appcache cache.appcache +1 -1

index.html index.html +19 -2

未找到文件。
--- a/cache.appcache
+++ b/cache.appcache
@@ -3,7 +3,7 @@ CACHE MANIFEST
 # Adds the ability to play the game online.
 # The following comment needs to be updated whenever a change is made.
 # Run `rake appcache:update` to do so
-# Updated: 2014-12-07T22:34:52+03:00
+# Updated: 2014-12-10T12:13:34-08:00

 # Main page
 index.html

--- a/index.html
+++ b/index.html
@@ -19,10 +19,27 @@

  <meta name="apple-itunes-app" content="app-id=868076805">

-  <meta property="og:title" content="2048 game"/>
-  <meta property="og:site_name" content="2048 game"/>
+  <meta property="og:title" content="2048"/>
+  <meta property="og:site_name" content="2048"/>
  <meta property="og:description" content="Join the numbers and get to the 2048 tile! Careful: this game is extremely addictive!"/>
  <meta property="og:image" content="http://gabrielecirulli.github.io/2048/meta/og_image.png"/>
+
+  <meta name="twitter:card" content="app" />
+  <meta name="twitter:site" content="@gabrielecirulli" />
+  <meta name="twitter:title" content="2048" />
+  <meta name="twitter:description" content="Join the numbers and get to the 2048 tile! Careful: this game is extremely addictive!" />
+  <meta name="twitter:image" content="http://gabrielecirulli.github.io/2048/meta/og_image.png" />
+  <meta name="twitter:url" content="http://gabrielecirulli.github.io/2048/" />
+  <meta name="twitter:app:country" content="US">
+  <meta name="twitter:app:name:iphone" content="2048">
+  <meta name="twitter:app:id:iphone" content="868076805">
+  <meta name="twitter:app:url:iphone" content="https://itunes.apple.com/us/app/2048-by-gabriele-cirulli/id868076805">
+  <meta name="twitter:app:name:ipad" content="2048">
+  <meta name="twitter:app:id:ipad" content="868076805">
+  <meta name="twitter:app:url:ipad" content="https://itunes.apple.com/us/app/2048-by-gabriele-cirulli/id868076805">
+  <meta name="twitter:app:name:googleplay" content="2048">
+  <meta name="twitter:app:id:googleplay" content="com.gabrielecirulli.app2048">
+  <meta name="twitter:app:url:googleplay" content="https://play.google.com/store/apps/details?id=com.gabrielecirulli.app2048">
 </head>
 <body>
  <div class="container">