Permalink
Browse files

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

  • Loading branch information...
2 parents 5231671 + a6ce67d commit ecdd80e5522d36eeed6028ce99aee200b2723107 Sridatta Thatipamala committed Mar 10, 2011
Showing with 9 additions and 5 deletions.
  1. +3 −1 public/css/style.css
  2. BIN public/images/by.png
  3. +2 −2 public/js/jazz.js
  4. +4 −2 views/index.ejs
View
@@ -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;
}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -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();
});
});
View
@@ -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>

0 comments on commit ecdd80e

Please sign in to comment.