Merge branch 'fbauth' of github.com:gravityonmars/Balloons.IO into fb…

…auth
oytuntez · Aug 1, 2012 · 4a62a01 · 4a62a01
2 parents 4c9faff + 691f56d
commit 4a62a01
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -445,6 +445,16 @@ sidebar .files a span{
 sidebar .files  a i{ margin: 4px; display: block; width: 12px; height: 12px}
 sidebar .files  a.picture i{background: url('../img/icons.png') no-repeat 0 1px;}
 sidebar .files  a.file i{background: url('../img/icons.png') no-repeat 0 -59px;}
+sidebar .sidebar-open-source{background: red; bottom: 0; position: absolute; right: 0; left: 0; padding: 6px; text-align: center; text-transform: uppercase;
+		font-size: 10px;
+		color: #999;
+		box-shadow: 0 1px 0 rgba(255,255,255,.04) inset;
+		background-image: -webkit-linear-gradient(#272727,  #1b1b1c);
+		background-image: -moz-linear-gradient(#7e7e7e, #272727 8.6%, #090909);
+		background-image: -o-linear-gradient(#7e7e7e, #272727 8.6%, #090909);
+		border-top: 1px solid black;
+}
+sidebar .sidebar-open-source:hover{color: white}
 
 .content{position: absolute; bottom: 0; right: 0; top: 4.4em;  left: 201px;   }
 .content .chat{ z-index: 100; position: absolute; top: 0; left: 0; right: 0; bottom: 60px; overflow-y: scroll;  }
@@ -468,7 +478,7 @@ sidebar .files  a.file i{background: url('../img/icons.png') no-repeat 0 -59px;}
   background-image: -moz-linear-gradient(#fdfdfd 4.4%, #dfe2e9);
   background-image: -o-linear-gradient(#fdfdfd 4.4%, #dfe2e9);	
 }
-.content .chat-input input.text{height: auto; max-height: 1.2em; background: white url('../img/icon-chat.png') 10px center no-repeat; border-radius: 4px; width: 93%; padding: 1% 1% 1% 3%; display: block; margin: 1% 1.5%}
+.content .chat-input input.text{height: auto; max-height: 1.2em; background: white url('../img/icon-chat.png') 14px center no-repeat; text-indent: 26px; border-radius: 4px; width: 96%; padding: 14px 1%; display: block; margin: 10px 1%}
 
 
 .modal-invite{width: 500px}
@@ -541,13 +551,20 @@ sidebar .files  a.file i{background: url('../img/icons.png') no-repeat 0 -59px;}
 	background-image: -o-linear-gradient(#ccc 7.6%, #f7f7f7);
 }
 
+.fancy-theme .content{top: 50px}
+.fancy-theme .color-line{background: black; height: 2px; display: none;}
 .fancy-theme .wrap{background: url('../img/wood.jpg');}
-.fancy-theme .chat-box{background-color: #e4eaec; text-shadow: 0 1px 0 white; position: relative; margin: 1.4em; border-radius: 4px;  border-radius: 4px; padding: 1em; padding-left: 6em}
-.fancy-theme .chat{ background: url('../img/bg-double-line.png') center; left: 1em; bottom: 5em;  right: 1em; }
+/*.fancy-theme .chat-box{background-color: #e4eaec; text-shadow: 0 1px 0 white; position: relative; margin: 1.4em; border-radius: 4px;  border-radius: 4px; padding: 1em; padding-left: 6em}*/
+.fancy-theme .chat{ background: white; left: 12px; bottom: 78px;   right: 12px; }
 .fancy-theme .chat, .fancy-theme .line-chat{ box-shadow: 0 1px 1px rgba(0,0,0,.5)}
-.fancy-theme .line-chat{bottom: 4.8em; left: 1.2em; z-index: 50; right: 1.2em; background: white; position: absolute; height: 40px; }
-.fancy-theme .line-chat.second{bottom: 4.5em; z-index: 40; left: 1.4em; right: 1.4em}
-.fancy-theme .chat-input{background: url('../img/bg-purple.png'); border: 1px solid #000; box-shadow: 0 0 0 1px rgba(255,255,255,.1) inset,  0 0 10px 2px rgba(0,0,0,.65) inset ;}
+.fancy-theme .line-chat{bottom: 76px; left: 14px; z-index: 50; right: 14px; background: white; position: absolute; height: 40px; }
+.fancy-theme .line-chat.second{bottom: 74px; z-index: 40; left: 16px; right: 16px}
+.fancy-theme .chat-input{background: url('../img/bg-purple.png'); border-top: 1px solid #000;  box-shadow: 0 0 0 1px rgba(255,255,255,.1) ,  0 0 4px 2px rgba(0,0,0,.35) inset ;}
+.fancy-theme .chat-input input.text{border-color: black}
+.fancy-theme .chat-input input.text:focus{box-shadow: none}
+/*.fancy-theme .chat-input input{position: absolute; left: 12px; right: 0; top: 0; height: 400px}*/
+
+
 
 img{height: auto; width: auto;}
 body.home-page{background: #f1f1f1 url('../img/bg-site.png'); position: relative; }
@@ -569,29 +586,12 @@ body.home-page .homepage-container h2{font-weight: 100; color: #666}
 
 body.home-page .sign-in-twitter {background: url('../img/sign-in-with-twitter-l.png') no-repeat; margin: auto; width: 151px; height: 24px; display: block; text-indent: -1000em}
 
-/*body.home-page .homepage-container .slideshow{
-	-webkit-animation-name: slideshow;
- -webkit-animation-duration: 2s;
- -webkit-animation-timing-function: ease-out;
-}
-*/
-
 body.home-page .select-room-container {width: 600px;  margin: auto; margin-top: 5em; text-align: center;}
 body.home-page .select-room-container .logo{width: 120px; margin-bottom: 1em}
 
 body.home-page footer {font-size: 10px; font-weight: bold; bottom: 30px; text-transform: uppercase; padding: 1em;color: #999; right: 0; left: 0; text-align: center; position: absolute; }
 body.home-page footer a{color: #666}
 
-/*@-webkit-keyframes slideshow {
-  from {
-    left: 800px;
-		opacity: 0;
-  }
-  to {
-    left: 0;
-		opacity: 1;
-  }
-}*/
 
 .rooms-block, .create-room-block{float: left; width: 260px}
 .inactive{margin-top: 10px}

diff --git a/views/themes/default/room.jade b/views/themes/default/room.jade
@@ -38,7 +38,8 @@ block content
 		sidebar
 			include chat_list
 			include files_list
-
+			a(href="https://github.com/gravityonmars/Balloons.IO", target="_blank", class="sidebar-open-source") get the code from github
+
 		.content(role='main')
 			.chat
 				// chat-content
@@ -52,7 +53,7 @@ block content
 			.line-chat.second
 
 			.chat-input
-				input.text(type='text', name='', value='')
+				input.text(type='text', name='', placeholder="Your Message", value='')
 				// .chat-input
 
 	// .wrap