Merge remote-tracking branch 'origin/master' into gh-pages

README.md

@@ -3,13 +3,11 @@
 A game in the vein of Minesweeper, but cleared rows disappear akin to Tetris. 
 Rows with exploded mines cannot be cleared. See how far you can get!
 
-Left-click to clear a tile. Right-click to flag a mine. Middle-click a number to clear any non-flagged adjacent tiles.
+Left-click or tap to clear a tile. Right-click or hold to flag a mine. Click or tap a number to clear any non-flagged adjacent tiles.
 
 ## stuff to add
 save game using html5 local storage so player can come back later
 
-make cleared columns slide left?
-
 possibly add way to remove clicked mines (powerup/clump clicked mines together to destroy/get clicked mine to top/left of screen, etc.)
 
 Need to test on mobile devices etc.
@@ -19,4 +17,4 @@ the player can cheat under certain conditions; if there is only one tile left on
 
 need a fallback for browsers that don't support CSS3 viewport sizing
 
-colours used are not safe for red-green colourblindness
+colours used are not safe for red-green colourblindness. however, there is at least a visual distinction with the mines now

index.html

@@ -5,8 +5,14 @@
 		<style type="text/css">
 			@font-face {
 				font-family: Helsinki;
+			    src: url('helsinki.eot');
+			    src: url('helsinki.eot?#iefix') format('embedded-opentype'),
+			         url('helsinki.woff2') format('woff2'),
+			         url('helsinki.woff') format('woff'),
+			         url('helsinki.ttf') format('truetype'),
+			         url('helsinki.svg#helsinkiregular') format('svg');
 				font-weight: normal;
-    			src: url(helsinki.ttf);
+    			font-style: normal;
 			}
 
 			html {
@@ -29,7 +35,7 @@
 				background-color: #1b1c17;
 				float: left;
 				margin: 0 auto;
-				height: 90vmin;
+				height: 100vh - 10vmin;
 			}
 
 			#stats {
@@ -64,7 +70,7 @@
 			#stats div {
 				float: left;
 				font-size: 5.4vmin;
-				margin: 2vmin 4vmin;
+				margin: 2vmin;
 				width: auto;
 			}