Merge branch 'master' of github.com:Flotype/jazzroom

Flotype · Mar 10, 2011 · ecdd80e · ecdd80e
2 parents 5231671 + a6ce67d
commit ecdd80e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -14,7 +14,9 @@ html, body {
 }
 
 #head {
-  height: 150px;
+  height: 100px;
+  padding-top: 50px;
+  padding-left: 150px;
   background: url("/images/logo.png") left center no-repeat;
 }
 

diff --git a/public/images/by.png b/public/images/by.png
diff --git a/public/js/jazz.js b/public/js/jazz.js
@@ -31,10 +31,10 @@ function connected() {
     }
   });
 
-  $("#vailmsg").fadeOut(300, function(){
+  $("#vailmsg").fadeOut(200, function(){
     $(this).text("You're playing the " + instrument);
     $(this).fadeIn(300, function(){
-      $("#vail").delay(700).fadeOut(300).remove();
+      $("#vail").delay(1000).fadeOut(300).remove();
     });
   });
 

diff --git a/views/index.ejs b/views/index.ejs
@@ -24,9 +24,11 @@
 </head>
 
 <body>
-<div id="vail"><span id="vailmsg">Connecting...</span></div>
+<div id="vail"><span id="vailmsg">We're finding a room for you...</span></div>
 <div id="wrap">
-  <div id="head"></div>
+  <div id="head">
+    <a href="http://nowjs.com"><img src="/images/by.png" id="by"></a>
+  </div>
   <div id="main">
     <div id="instruments">
       <div id="piano"></div>