diff --git a/README.md b/README.md index fe44bd3..799b40b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A project based learning activity for people who are getting started with Git and GitHub. -You can play the game at: http://githubschool.github.io/github-games/ +You can play the game at: http://mhmohapatra.github.io/github-games/ >> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_ diff --git a/inde.html b/index.html similarity index 99% rename from inde.html rename to index.html index cb820e8..c50aa50 100644 --- a/inde.html +++ b/index.html @@ -11,7 +11,11 @@ #menu p { margin: 0.5em 0; text-align: center; } #menu p a { text-decoration: none; color: black; } #upcoming { display: block; margin: 0 auto; background-color: #E0E0E0; } +<<<<<<< HEAD + #score { color: yellow; font-weight: bold; vertical-align: middle; } +======= #score { color: green; font-weight: bold; vertical-align: middle; } +>>>>>>> gh-pages #rows { color: blue; font-weight: bold; vertical-align: middle; } #stats { position: absolute; bottom: 0em; right: 1em; } @media screen and (min-width: 0px) and (min-height: 0px) { #tetris { font-size: 0.75em; width: 250px; } #menu { width: 100px; height: 200px; } #upcoming { width: 50px; height: 50px; } #canvas { width: 100px; height: 200px; } } /* 10px chunks */ @@ -75,7 +79,7 @@ ctx = canvas.getContext('2d'), ucanvas = get('upcoming'), uctx = ucanvas.getContext('2d'), - speed = { start: 0.6, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds) + speed = { start: 0.3, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds) nx = 10, // width of tetris court (in blocks) ny = 20, // height of tetris court (in blocks) nu = 5; // width/height of upcoming preview (in blocks)