diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-04-03 18:00:25 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-04-03 18:00:25 +0200 |
| commit | 298b53e93adb4d2822e7677e6c10aa273de5bf26 (patch) | |
| tree | 148c7e03a18e3960b779f58cb0f6230f45e86576 /view/tpl | |
| parent | 470f14b919b5afa1d8e7e8a213b0bd4889619fc2 (diff) | |
| parent | f13096a6f3b26d9e88dc0d6c07c63a1d5f75346e (diff) | |
| download | volse-hubzilla-298b53e93adb4d2822e7677e6c10aa273de5bf26.tar.gz volse-hubzilla-298b53e93adb4d2822e7677e6c10aa273de5bf26.tar.bz2 volse-hubzilla-298b53e93adb4d2822e7677e6c10aa273de5bf26.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/chat.tpl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 19b025820..9cf5968cb 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -18,17 +18,12 @@ <div id="chatTopBar"> <div id="chatLineHolder"></div> </div> - - <div class="clear"></div> - <div id="chatBottomBar" > - <div class="tip"></div> <form id="chat-form" method="post" action="#"> <input type="hidden" name="room_id" value="{{$room_id}}" /> - <textarea id="chatText" name="chat_text" class="form-control"></textarea> <div class="form-group"> - + <textarea id="chatText" name="chat_text" class="form-control"></textarea> </div> <div id="chat-submit-wrapper"> <div id="chat-submit" class="dropup pull-right"> @@ -65,7 +60,7 @@ <div class="btn-group hidden-xs"> <button id="chat-link-wrapper" class="btn btn-default btn-sm" onclick="chatJotGetLink(); return false;" > <i id="chat-link" class="icon-link jot-icons" title="{{$insert}}" ></i> - </button--> + </button> </div> {{if $feature_encrypt}} <div class="btn-group hidden-xs"> @@ -86,8 +81,6 @@ {{/if}} </ul> </div> - - </div> <div id="chat-rotator-wrapper" class="pull-left"> <div id="chat-rotator"></div> @@ -113,7 +106,7 @@ $(document).ready(function() { }); $(window).resize(function () { - if($('.generic-content-wrapper').hasClass('fullscreen')) { + if($('main').hasClass('fullscreen')) { adjustFullscreenTopBarHeight(); } else { |