diff --git a/labs/meteor-client/client/main.html b/labs/meteor-client/client/main.html index 0fca521046..1863ab2e35 100755 --- a/labs/meteor-client/client/main.html +++ b/labs/meteor-client/client/main.html @@ -82,7 +82,7 @@ {{> whiteboard id="whiteboardContainer" title="Whiteboard" name="whiteboard"}} {{> chatbar id="chat" title="Chat" name="chatbar"}} - {{> footer}} + {{doFinalStuff}} diff --git a/labs/meteor-client/client/stylesheets/chat.less b/labs/meteor-client/client/stylesheets/chat.less index f8db57452d..e29f4e407e 100755 --- a/labs/meteor-client/client/stylesheets/chat.less +++ b/labs/meteor-client/client/stylesheets/chat.less @@ -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; diff --git a/labs/meteor-client/client/stylesheets/style.css b/labs/meteor-client/client/stylesheets/style.css index 0d8bce7fda..ce44a0d569 100755 --- a/labs/meteor-client/client/stylesheets/style.css +++ b/labs/meteor-client/client/stylesheets/style.css @@ -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{} diff --git a/labs/meteor-client/client/stylesheets/users.less b/labs/meteor-client/client/stylesheets/users.less index d9c6c1dbbf..7b27699495 100755 --- a/labs/meteor-client/client/stylesheets/users.less +++ b/labs/meteor-client/client/stylesheets/users.less @@ -1,12 +1,10 @@ #users { - height: 400px; margin-left: 0.5%; padding-bottom: 10px; width: 12%; } #user-contents { - height: 100%; padding-bottom: 10px; } diff --git a/labs/meteor-client/client/stylesheets/whiteboard.less b/labs/meteor-client/client/stylesheets/whiteboard.less index 040c210c26..d21ed23687 100755 --- a/labs/meteor-client/client/stylesheets/whiteboard.less +++ b/labs/meteor-client/client/stylesheets/whiteboard.less @@ -1,5 +1,4 @@ #whiteboardContainer { - height:660px; margin-left: 0.5%; margin-right: 0.5%; width:61%; diff --git a/labs/meteor-client/client/views/chat/chat_bar.html b/labs/meteor-client/client/views/chat/chat_bar.html index d9e3f47151..b95056560a 100755 --- a/labs/meteor-client/client/views/chat/chat_bar.html +++ b/labs/meteor-client/client/views/chat/chat_bar.html @@ -1,20 +1,23 @@