diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-02 17:50:24 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-02 17:50:24 +0100 |
| commit | 8568eb287338c3222fcfb4a81f7a2c04dd114751 (patch) | |
| tree | b1c90ab0f48c5ace67dac3ca1b90f5a1e9155d8e /view/tpl/chat.tpl | |
| parent | 9fcc2a18dfb042eca619d338ed6615bff3784be5 (diff) | |
| parent | 96e423dcfcb126241fb2787a816c687ce070cade (diff) | |
| download | volse-hubzilla-8568eb287338c3222fcfb4a81f7a2c04dd114751.tar.gz volse-hubzilla-8568eb287338c3222fcfb4a81f7a2c04dd114751.tar.bz2 volse-hubzilla-8568eb287338c3222fcfb4a81f7a2c04dd114751.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/tpl/chat.tpl')
| -rw-r--r-- | view/tpl/chat.tpl | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index dba6a777f..eb98063fa 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,14 +1,14 @@ <h1>{{$room_name}}</h1> -<div id="chatContainer" style="height: 100%; width: 100%;"> +<div id="chatContainer""> - <div id="chatTopBar" style="float: left; height: 400px; width: 650px; overflow-y: auto;"> + <div id="chatTopBar"> <div id="chatLineHolder"></div> </div> - <div id="chatUsers" style="float: right; width: 120px; height: 100%; border: 1px solid #000;" ></div> + <div id="chatUsers"></div> <div class="clear"></div> - <div id="chatBottomBar" style="position: relative; bottom: 0; height: 150px; margin-top: 20px;"> + <div id="chatBottomBar"> <div class="tip"></div> <form id="chat-form" method="post" action="#"> @@ -22,11 +22,6 @@ </div> </div> -<style> -section { - padding-bottom: 0; -} -</style> <script> var room_id = {{$room_id}}; |