Merge branch 'master' of github.com:diversify/janu

diversify · Nov 23, 2014 · eff3dca · eff3dca
2 parents 6240780 + 8c56bba
commit eff3dca
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 16 deletions.
diff --git a/app/partials/game.html b/app/partials/game.html
@@ -1,6 +1,6 @@
 
 
-<div id="game-header"><h2><a href="/">BACK</a></div>
+<div id="game-header"><h2><a href="/"><img src="content/image/logo.png" alt="logo" id="logo" /> <h2>Saturn</h2></a></div>
 <div class="rings-in-back"></div>
 <div class="rings-in-front"></div>
 

diff --git a/app/partials/start.html b/app/partials/start.html
@@ -1,6 +1,6 @@
 <div id="start">
 	<img src="content/image/logo.png" alt="logo" id="logo" />
-	<h1>SATURN</h1>
+	<h1>Saturn</h1>
 
 	<p>Expand your music collection and <br>guess when music was made!</p>
 	<a href="/game"><button>Play!</button></a>

diff --git a/app/partials/win.html b/app/partials/win.html
@@ -1,6 +1,6 @@
-<div class="summary-song correct"></div>
-<div class="summary-song wrong"></div>
-<div class="summary-song correct"></div>
-<div class="summary-song wrong"></div>
-<div class="summary-song correct"></div>
-<div class="summary-song wrong"></div>
+<div id="win">
+	<img src="content/image/logo.png" alt="logo" id="logo" />
+
+	<h2>YOU WON!</h2>
+	<p>Hope you had fun! Here are all the songs:</p>
+</div>
diff --git a/content/style.css b/content/style.css
@@ -69,7 +69,20 @@ label {
 #game-header {
     background: #eee;
     width: 100%;
-    padding: 25px;
+    padding: 5px 15px;
+}
+
+#game-header #logo {
+    height: 60px;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+#game-header h2 {
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 34px;
+    padding-left: 10px;
 }
 
 .caret-down {
@@ -119,7 +132,7 @@ label {
     border-radius: 50% 50% 0 0;
     -moz-border-radius: 50% 50% 0 0;
     -webkit-border-radius: 50% 50% 0 0;
-    border-top: 4px solid #ff9000;
+    border-top: 8px solid #ff9000;
     margin: auto;
     position: relative;
     top: 177px;
@@ -135,7 +148,7 @@ label {
     border-radius: 50% 50%;
     -moz-border-radius: 50% 50%;
     -webkit-border-radius: 50% 50%;
-    border-bottom: 4px solid #ff9000;
+    border-bottom: 8px solid #ff9000;
     margin: auto;
     margin-bottom: -40px;
     position: relative;
@@ -171,7 +184,7 @@ label {
 }
 
 .title {
-    font-size: 24px;
+    font-size: 24px !important;
     font-weight: bold;
 }
 
@@ -226,10 +239,11 @@ label {
     margin-left: -200px;
     top: 380px;
     text-align: center;
+    font-size: 16px;
 }
 
 #song-details h2 {
-    font-size: 24px;
+    font-size: 18px;
 }
 
 #current-song-circle, .song-circle {
@@ -323,10 +337,10 @@ label {
     font-size: 24px;
     border-radius: 15px;
     border-bottom: 5px solid rgba(0,0,0,0.2);
-    padding-bottom: 25px;
+    padding-bottom: 45px;
 }
 
-#start #logo {
+#start #logo, #win #logo {
     width: 250px;
     margin-bottom: 25px;
 }
@@ -343,7 +357,7 @@ button {
 }
 
 #start h1 {
-    margin-bottom: 40px;
+    margin-bottom: 20px;
     color: #202020;
 }