Merge branch 'clay-improvements' of https://github.com/Hextris/hextris into clay-improvements

index.html

@@ -100,7 +100,7 @@
 				<div class = 'score'><span class = 'scoreNum'>4.</span> 960</div>
 			</div>
 			<div id = 'bottomContainer'>
-				<img id = 'restart' src = './images/btn_restart.svg' height = '57px'>
+				<img id='restart' src = './images/btn_restart.svg' height = '57px'>
 				<div id = 'socialShare'>
 					<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 					<svg width="224.6377px" height="57px"  viewBox="0 0 255 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
@@ -132,7 +132,7 @@
 										class="cls-2" fill-rule="evenodd" />
 									</svg>
 								</span>
-								<span class="rrssb-text">fb</span>
+								<span class="rrssb-text">facebook</span>
 							</a>
 						</li>
 						<li class="rrssb-twitter">

js_v9/main.js

@@ -56,6 +56,7 @@ function checkVisualElements() {
 	if (!$('#pauseBtn').is(':visible')) $('#pauseBtn').fadeIn(150, "linear");
 	$('#fork-ribbon').fadeOut(150);
 	if (!$('#restartBtn').is(':visible')) $('#restartBtn').fadeOut(150, "linear");
+	if ($('#buttonCont').is(':visible')) $('#buttonCont').fadeOut(150, "linear");
 }
 
 function hideUIElements() {

js_v9/view.js

@@ -182,7 +182,10 @@ function gameOverDisplay() {
 	$("#attributions").show();
 	var c = document.getElementById("canvas");
 	c.className = "blur";
-	showText('gameover');
+	$("#gameoverscreen").fadeIn();
+	$("#container").fadeIn();
+	$("#socialShare").fadeIn();
+	$("#restart").fadeIn();
 }
 
 function pause(o) {
@@ -198,6 +201,7 @@ function pause(o) {
 	if (gameState == -1) {
 		$('#fork-ribbon').fadeOut(150, 'linear');
 		$('#restartBtn').fadeOut(150, "linear");
+		$('#buttonCont').fadeOut(150, "linear");
 		if ($('#helpScreen').is(':visible')) {
 			$('#helpScreen').fadeOut(150, "linear");
 		}
@@ -210,6 +214,7 @@ function pause(o) {
 		}, 200)
 	} else if (gameState != -2 && gameState !== 0 && gameState !== 2) {
 		$('#restartBtn').fadeIn(150, "linear");
+		$('#buttonCont').fadeIn(150, "linear");
 		$('.helpText').fadeIn(200, 'linear');
 		if (message == 'paused') {
 			showText(message);

style/style.css

@@ -368,10 +368,23 @@ body {
 }
 
 #gameoverscreen {
+   /*display:none;*/
+}
+#container {
+   display:none
+}
+#restart{
    display:none;
+}
+#socialShare{
+   display:none;
+}
+#buttonCont{
+   display block !important;
 
 }
 
+
 .unselectable {
 	-webkit-touch-callout: none;
 	-webkit-user-select: none;