Updated scss/css

mockup/index.html

@@ -240,7 +240,8 @@
                         </dd>
                     </dl>
                 </div>
-                <div id="chatrooms" style="display: none;">
+              </div>
+              <div id="chatrooms" class="controlbox-pane" style="display: none;">
                   <form class="add-chatroom" action="" method="post">
                       <input type="text" name="chatroom" class="new-chatroom-name" placeholder="Room name">
                       <input type="text" name="nick" class="new-chatroom-nick" placeholder="Nickname">
@@ -274,7 +275,6 @@
             </div>
         </div>
     </div>
-    </div>
 
     <div class="chatbox" id="37c0c87392010303765fe36b05c0967d62c6b70f">
         <div class="box-flyout">
@@ -369,7 +369,6 @@
             <div class="chat-body">
                 <div class="chat-area">
                     <div class="chat-content">
-                        <time class="chat-date" datetime="2013-06-04T00:00:00.000Z">Tue Jun 04 2013</time>
                         <div class="chat-message ">
                             <span class="chat-message-room">18:50 luke:&nbsp;</span>
                             <span class="chat-message-content">leia: hi :)</span>
@@ -379,6 +378,7 @@
                             <span class="chat-message-content">
                                 I'll be gone for a while, will be back in about an hour</span>
                         </div>
+                        <time class="chat-date" datetime="2013-06-04T00:00:00.000Z">Tue Jun 04 2013</time>
                         <div class="chat-message ">
                             <span class="chat-message-room">19:40 Obi-wan Kenobi, Jedi Master:&nbsp;</span>
                             <span class="chat-message-content">
@@ -540,6 +540,9 @@ $(document).ready(function () {
     $('a[href=#users]').click(function (ev) {
         switchTab(ev); 
     });
+    $('a[href=#register]').click(function (ev) { 
+        switchTab(ev);
+    });
 
     $("a.choose-xmpp-status").click(function (ev) {
         ev.preventDefault();
@@ -550,8 +553,7 @@ $(document).ready(function () {
         ev.preventDefault();
         var form = ''+
                 '<form id="set-custom-xmpp-status">' +
-                    '<input type="text" class="custom-xmpp-status"I am online"'+
-                        'placeholder="I am online"/>' +
+                    '<input type="text" class="custom-xmpp-status" placeholder="Custom status"/>' +
                     '<button type="submit">Save</button>' +
                 '</form>';