Lots of UI stuff

This commit is contained in:
perroned 2014-08-11 09:21:14 -07:00
parent ef0168fbf4
commit d6bcf90b3e
6 changed files with 37 additions and 21 deletions

View File

@ -82,7 +82,7 @@
{{> whiteboard id="whiteboardContainer" title="Whiteboard" name="whiteboard"}}
{{> chatbar id="chat" title="Chat" name="chatbar"}}
<audio id="remote-media" autoplay="autoplay"></audio>
{{> footer}}
<!-- {{> footer}} -->
{{doFinalStuff}}
</div>
</body>

View File

@ -1,16 +1,31 @@
#chat {
height: 660px;
background: #fff;
border: 1px solid #ccc;
float: left;
min-height:500px;
overflow: hidden;
width: 25%;
}
#chatbar-contents {
height: 70%;
margin-right:2px;
overflow:hidden;
}
#chatbar-footer{
position:static;
bottom: 0;
min-height:50px;
max-height:60px;
}
#chatbar-title{
position:static;
top: 0;
}
.chatGreeting {
color: blue;
font-size: 12px;
line-height: 14px;
}
#chatbar-contents {
height:72%;
margin-bottom:0px;
}
.chat-entry{}
.chat-entry tr:nth-child(odd) {}
.chat-entry tr:nth-child(even) {
@ -18,7 +33,7 @@
}
.chat-input-wrapper {
margin-left:20px;
margin-top:15px;
}
.chat-message {
font-size: 12px;

View File

@ -2,13 +2,15 @@
body {
background: #eee;
color: #666666;
position:absolute; top:0; bottom:0; left:0; right:0; height:100%;
}
.chatBarIcon{}
.component{
background: #fff;
border: 1px solid #ccc;
float: left;
overflow: hidden;
height:90%;
}
.gradientBar{
background: -webkit-linear-gradient(rgb(255,255,255), rgb(182,181,181)); /* For Safari 5.1 to 6.0 */
@ -19,8 +21,7 @@ body {
.hideNavbarIcon{}
.lowerHand{}
.mainContainer{
min-width: 1300px;
overflow: hidden;
height:100%;
}
.myFooter{
color:black;
@ -81,7 +82,7 @@ body {
.ScrollableWindow {
height: 100%;
overflow: scroll;
overflow-y: scroll;
padding-right:5px;
}
.settingsIcon{}

View File

@ -1,12 +1,10 @@
#users {
height: 400px;
margin-left: 0.5%;
padding-bottom: 10px;
width: 12%;
}
#user-contents {
height: 100%;
padding-bottom: 10px;
}

View File

@ -1,5 +1,4 @@
#whiteboardContainer {
height:660px;
margin-left: 0.5%;
margin-right: 0.5%;
width:61%;

View File

@ -1,20 +1,23 @@
<template name="chatbar">
<div id="{{id}}" {{visibility name}} class="component">
<h3 class="title gradientBar">{{title}}</h3>
{{> tabButtons}}
<div id="chatbar-title">
<h3 class="title gradientBar">{{title}}</h3>
{{> tabButtons}}
</div>
<div id="chatbar-contents">
{{#if getInSession "display_chatPane"}}
{{#Layout template="scrollWindow" id="chatScrollWindow"}}
{{#contentFor region="scrollContents"}}
{{> messageBar}}
{{/contentFor}}
{{/Layout}}
{{else}}
{{> optionsBar}}
{{/Layout}}
{{else}}
{{> optionsBar}}
{{/if}}
</div>
{{> chatInput}}
<div id="chatbar-footer">
{{> chatInput}}
</div>
</div>
</template>