merge

diversify · Nov 23, 2014 · fd914e4 · fd914e4
2 parents 9184af7 + c682a63
commit fd914e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/controllers.js b/app/controllers/controllers.js
@@ -15,6 +15,7 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
   // start game
   $scope.startGame = function () {
     // reset all game variables
+    $scope.timeLeft = 15;
     $scope.timelineSongs = [];
     $scope.timelineYears = [];
     $scope.currentSong = undefined;
@@ -27,7 +28,6 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
     $scope.comboplyer = 1;
     $scope.roundActive = false;
 
-
     var loopImages = function(){
 
          $('#combo-div').fadeIn(1500, function(){
@@ -38,6 +38,7 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
     loopImages();
 
     // this is the first song the user guesses
+    $("#song-details").hide();
     firstSong = fetchNewSong();
     $('#album-cover').addClass('no-blur'); 
     playSong(firstSong);

diff --git a/app/partials/game.html b/app/partials/game.html
@@ -7,7 +7,7 @@
 <div id="song-details" class="hidden">
 	<h2 class="title">{{currentSong.name}}</h2>
 	<h2>{{currentSong.artist_name}}</h2>
-	<h2>{{currentSong.year}}</h2>
+	<h2><strong>{{currentSong.year}}</strong></h2>
 </div>
 
 <div id="game-content" ng-init="init()">

diff --git a/content/style.css b/content/style.css
@@ -160,6 +160,7 @@ label {
     text-align: center;
     color: #f5f5f5;
     font-size: 60px;
+    text-shadow: #202020 0px 0px 5px;
 }
 
 .question-and-timer {