Minor CSS fixes and a bug fix

Fixes a bug that meant the time and clones wasn't filled out correctly
Dave-and-Mike · Nov 27, 2012 · f597d54 · f597d54
1 parent 5842e6d
commit f597d54
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/css/main.css b/css/main.css
@@ -117,7 +117,7 @@
  width:180px;
  height:92px;
  top:-313px;
- margin-left:275px;
+ margin-left:277px;
 }
 
 #game_scorecard .nextLevel:hover
@@ -144,5 +144,5 @@
  width:100px;
  height:101px;
  top:-160px;
- margin-left:197px;
+ margin-left:198px;
 }
diff --git a/js/lib/scorecard.js b/js/lib/scorecard.js
@@ -44,8 +44,8 @@ function scorecard()
  }
 
  this.show = function(){
- $('#game_scorecard p.clones').text(_clones);
- $('#game_scorecard p.time').text(_calcTime());
+ $('#game_scorecard .clones').text(_clones);
+ $('#game_scorecard .time').text(_calcTime());
 
  var score = 0;
 

diff --git a/js/lib/startMenu.js b/js/lib/startMenu.js
@@ -37,10 +37,24 @@ function startMenu()
  return false;
  }
 
- $('.nextLevel .resetLevel').die();
+ var backToMenu = function(event){
+ if ( typeof(event) !== 'undefined' )
+ {
+ event.preventDefault();
+ }
+
+ _world = null;
+ $('#game_scorecard_bg').remove();
+ return false;
+ }
+
+ $('.nextLevel').die();
+ $('.resetLevel').die();
+ $('.mainMenu').die();
 
  $('.nextLevel').live('click', nextLevel);
  $('.resetLevel').live('click', resetLevel);
+ $('.mainMenu').live('click', backToMenu);
 
  //Initialise the first level
  nextLevel();