Merge branch 'gh-pages' of https://github.com/Hextris/hextris into gh-pages

This commit is contained in:
Logan Engstrom 2014-08-18 11:24:12 -04:00
commit 16e1736bf1
3 changed files with 21 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -3,6 +3,15 @@
<head>
<title>Hextris</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, minimal-ui"/>
<meta property="og:url" content="http://hextris.github.io/hextris/" />
<meta property="og:site_name" content="Hextris" />
<meta property="og:title" content="Hextris" />
<meta property="og:description" content="An addictive puzzle game inspired by Tetris." />
<meta property="og:type" content="website" />
<meta property="og:author" content="https://www.facebook.com/hextris" />
<meta property="og:image" content="http://hextris.github.io/hextris/images/facebook-opengraph.png" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<link rel="icon" type="image/png" href="favicon.ico">
<link rel="stylesheet" type="text/css" href="style/style.css">
<link rel="stylesheet" href="style/fa/css/font-awesome.min.css">
@ -27,6 +36,14 @@
<script type = 'text/javascript' charset = 'utf-8' src = 'cordova.js'></script>
</head>
<body>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<canvas id="canvas"></canvas>
<div id='devtools' style='z-index:3;display:none;position:absolute;left:50%;width:400px;height:400px;top:50%;margin-top:-200px;margin-left:-200px;'>
<h2 id = 'clickToExit' style = 'background-color:#fff;color:#000'>Click to exit</h2>
@ -73,7 +90,8 @@
<div id="bottombar">
<a href="https://twitter.com/intent/tweet?hashtags=hextris&original_referer=http%3A%2F%2F0.0.0.0%3A8080%2F&text=Play%20Hextris!%20-&tw_p=tweetbutton&url=http%3A%2F%2Fhextris.github.io%2F" class="twitter-share-button" data-url="http://hextris.github.io/" data-text="Play Hextris! -" data-hashtags="hextris">Tweet</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
<iframe id = 'ghl' src="http://ghbtns.com/github-btn.html?user=Hextris&repo=Hextris&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="20" onload='showbottombar()'></iframe>
<iframe id = 'ghl' src="http://ghbtns.com/github-btn.html?user=Hextris&repo=Hextris&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="80" height="20" onload='showbottombar()'></iframe>
<div data-width="20" class="fb-share-button" data-href="http://hextris.github.io/hextris" style="top:auto; left:3px; bottom:5px; position:relative; vertical-align:top;zoom:1;*display:inline" ></div>
</div>
<script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-51272720-2', 'auto'); ga('send', 'pageview'); </script>
</body>

View file

@ -9,13 +9,13 @@
margin:0;
}
a {
color:#232323;
}
.twitter-share-button { width: 90px !important; }
.navbar {
width: 80%;
margin: 0 auto;
@ -280,7 +280,7 @@ body {
width:1000px;
text-align:center;
left:50%;
margin-left:-500px;
margin-left:-510px;
bottom:10px;
z-index:98;
}