Merge branch 'chat-table-layout'

mitmedialab · Oct 23, 2014 · 0bc0796 · 0bc0796
2 parents d5367fa + 2c92ccf
commit 0bc0796
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/public/css/screen.styl b/public/css/screen.styl
@@ -708,30 +708,37 @@ hr.noshade {
     border-radius: 2px;
     background-color: #eee;
 
-    //overflow-y: auto;
+    chat-input-height = 3em
 
     .panel {
+      display: flex
+      flex-flow: column nowrap
       height: 100%;
+      width: 100%;
       background-color: #eee;
     }
-
+    .panel-heading {
+      width: 100%
+      max-height: 50%
+      overflow: auto
+    }
     .panel-body {
-      height: 82%;
-      overflow-y: scroll;
+      flex: 2
+      height: 100%
+      width: 100%
       padding: 0 15px;
       margin-right: -10px;
+      overflow: auto
     }
-
     .panel-footer {
+      height: chat-input-height
+      width: 100%
       border-top: 0;
       padding: 10px 0px;  
       background-color: inherit;
     }
 
     #chat-list-container {
-      height: auto;
-      width: auto;
-
       .chat-message {
         word-wrap: break-word;
         list-style-type: none;

diff --git a/views/event.ejs b/views/event.ejs
@@ -157,11 +157,9 @@
             <div class="panel-heading">
                 <div id='welcome-message'></div>
             </div>
-
             <div class="panel-body">
                 <div id='chat-messages'></div>
             </div>
-
             <div class="panel-footer">
                 <div id="chat-input-region"></div>
             </div>