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

js/view.js

@@ -126,17 +126,14 @@ function showText(text){
             }
         }
     }
-
-    var pt = document.getElementById("overlay");
-    pt.className = 'unfaded';
-    
+	$("#overlay").html(messages[text]);
+	$("#overlay").fadeIn("1000","swing")
     if (text == 'paused') {
         if (settings.platform == 'mobile') {
             text = 'pausedMobile';
         }
     }
 
-    pt.innerHTML = messages[text];
 
     if (text == 'gameover') {
         if (settings.platform == 'mobile') {
@@ -160,9 +157,8 @@ function setMainMenu() {
 }
 
 function hideText(text){
-    var pt = document.getElementById("overlay");
-    pt.className = 'faded';
-    pt.innerHTML = '';
+	$("#overlay").fadeOut("1000",function(){$("#overlay").html("");})
+
 }
 function gameOverDisplay(){
 	updateHighScore();
@@ -208,6 +204,7 @@ function pause(o) {
         $('.helpText').show();
         showbottombar();
         if (message == 'paused') {
+			console.log("sup");
             showText(message);
         }
 

style/style.css

@@ -154,14 +154,6 @@ and (max-device-width : 480px) {
     z-index:3001;
 }
 
-.faded {
-    opacity:0;
-}
-
-.unfaded {
-    opacity:1;
-}
-
 .centeredHeader {
    font-size:5em; 
    text-align:center;
@@ -279,4 +271,4 @@ body {
     margin-left:-500px;
 	bottom:10px;
 	z-index:98;
-}
+}