style

rishabhjaishwal · Mar 13, 2016 · 49b5508 · 49b5508
1 parent 473d755
commit 49b5508
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/dev/client/controlpanel/style/admin.css b/dev/client/controlpanel/style/admin.css
@@ -86,7 +86,7 @@ div#socketchatbox-online {}
   padding: 20px;
 }
 .socketchatbox-scriptHistoryScript {
-  margin-top: 20px;
+  margin-top: 10px;
   max-height: 100px;
   overflow-y: scroll;
 }
@@ -153,13 +153,10 @@ div#socketchatbox-online {}
   /*border-top: 1px solid lightgray;*/
 }
 
-.table {
-
-  background: #F6F6F6 !important;
-}
+.table {background: #FBFBFB !important;}
 
 .socketchatbox-userdetail {
-  /*border: 1px solid lightgray;*/
+  border-top: 1px dashed lightgray;
   background: #FFFFFF;
   margin-top: 20px;
   display:none;
@@ -240,7 +237,7 @@ div#socketchatbox-online {}
 }
 
 .socketchatbox-userdetail-actions-each:nth-child(even) {
-  background: #F5F5F5;
+  background: #F7F7F7;
 }
 
 
@@ -257,7 +254,7 @@ div#socketchatbox-online {}
   height: 100px;  
   width: 100%;
   outline: none;
-  padding-right: 5px; 
+  padding-left: 20px; 
   border: 1px solid lightgray;
 }
 .breakable {

diff --git a/dev/client/controlpanel/views/index.html b/dev/client/controlpanel/views/index.html
@@ -49,7 +49,7 @@
                         <button class="prevScript"> < </button>
                         <button class="nextScript"> > </button>
                         <button class="cloneScript">clone</button>    
-                        <div class="socketchatbox-scriptHistoryScript"></div>
+                        <pre class="socketchatbox-scriptHistoryScript"></pre>
                     </div>
                     <textarea placeholder="Type script here..." rows="3" cols="50"></textarea>
                     <div id="socketchatbox-scriptSentStatus"></div>

diff --git a/dev/server/handlers/roomHandler.js b/dev/server/handlers/roomHandler.js
@@ -7,18 +7,17 @@ var roomHandler = {};
 var roomDict = {};
 
 
+//TODO: add back md5.encode(inToken)
+roomHandler.validToken = function (inToken) {return inToken in roomDict;} 
+//TODO: add back md5.encode(inToken)
+roomHandler.getUsersInRoom = function(inToken) {return roomDict[inToken].userDict;} 
 
-roomHandler.validToken = function (inToken) {return inToken in roomDict;} //TODO: add back md5.encode(inToken)
 
-roomHandler.getUsersInRoom = function(inToken) {return roomDict[inToken].userDict;} //TODO: add back md5.encode(inToken)
-
-
-// check if the socket's user already in a room
+// Check if the socket's user already in a room
 // otherwise, use the input roomID
 // else go to lobby
 roomHandler.socketJoin = function(socket, roomID) {
 
-
     var user = socket.user;
 
     if (typeof(user.roomID) == 'undefined') {