Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 0cb0944 + d4c9faf commit f33aa1928376aa541ccf11e7f88d787a71b11efa @captn3m0 captn3m0 committed Aug 19, 2012
Showing with 21 additions and 10 deletions.
  1. +18 −7 public/custom.css
  2. +2 −2 public/room.html
  3. +1 −1 public/ui.js
View
@@ -109,6 +109,7 @@ body {
}
#chat-edit{
border:1px solid #bbb ;
+ padding-left:2px;
}
#editor, #preview{
font-size:1.2em;
@@ -282,11 +283,13 @@ ul.video-list li{
a.conf-back{
color: #FFF;
position: absolute;
- top:5px;
- right:5px;
+ font-size: 20px;
+ top:15px;
+ right:15px;
text-decoration: none;
cursor: pointer;
-}.alert-msg {
+}
+.alert-msg {
display: none;
margin-top: 100px;
color: #777;
@@ -295,10 +298,18 @@ a.conf-back{
#androidbug {
display: none;
}
+#shareURL{
+ border:1px solid #333;
+ padding:3px;
+}
#shareURL:focus {
- border-color: rgba(236, 230, 82, 0.8);
+ border: 1px solid #333;
outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(209, 204, 81, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(214, 214, 98, 0.6);
+
+}
+#share{
+ margin-bottom: 10px;
+}
+div.chatbox{
+ overflow:auto;
}
View
@@ -97,8 +97,8 @@ <h1 id="overview">HackView</h1>
</script>
<form id = "chat-form" class="form-inline">
- <input id="chat-edit" type="text" size="20" placeholder="Type and hit Enter">
- <input type="submit" class="btn" value="Submit">
+ <input id="chat-edit" type="text" size="10" style="width:140px" placeholder="Type and hit Enter">
+ <input type="submit" class="btn" value="Send">
</form>
</div><!--/span-->
View
@@ -202,7 +202,7 @@ var UI=(function(){
//@todo Add this to the window as a div
//when we have the interface
var chatMessage = $('<div/>').attr('class','chat-message').text( msg );
- $('#overview').after( chatMessage );
+ $('#share').after( chatMessage );
},
refresh: _refresh,
init: function(cb){cb.call();}

0 comments on commit f33aa19

Please sign in to comment.