harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2016-04-03 18:00:25 +02:00
commit 298b53e93a
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
view/theme/redbasic/css/style.css
View File

@ -1518,7 +1518,14 @@ nav .dropdown-menu {
word-wrap: break-word; word-wrap: break-word;
} }
.generic-content-wrapper.fullscreen { main.fullscreen {
left: 0px;
width: 100%;
height: 100%;
max-width: none;
}
main.fullscreen .generic-content-wrapper {
position: absolute; position: absolute;
width: 100%; width: 100%;
top: 0px; top: 0px;
@ -1526,11 +1533,12 @@ nav .dropdown-menu {
border-radius: 0px; border-radius: 0px;
} }
.generic-content-wrapper.fullscreen .section-title-wrapper { main.fullscreen .section-title-wrapper {
border-radius: 0px; border-radius: 0px;
} }
.generic-content-wrapper.fullscreen .section-content-wrapper { main.fullscreen .section-content-wrapper,
main.fullscreen .section-content-wrapper-np {
border-radius: 0px; border-radius: 0px;
} }

6
view/theme/redbasic/js/redbasic.js
View File

@ -55,15 +55,13 @@ $(document).ready(function() {
function makeFullScreen(full) { function makeFullScreen(full) {
if(typeof full=='undefined' || full == true) { if(typeof full=='undefined' || full == true) {
$('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'}); $('main').css({'transition': 'none'}).addClass('fullscreen');
$('.generic-content-wrapper').addClass('fullscreen');
$('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); $('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
$('#inline-btn').show(); $('#inline-btn').show();
} }
else { else {
$('main').css({'left': '', 'width': '', 'max-width': ''}); $('main').removeClass('fullscreen');
$('.generic-content-wrapper').removeClass('fullscreen');
$('#fullscreen-btn, header, nav, aside').css({'display': ''}); $('#fullscreen-btn, header, nav, aside').css({'display': ''});
$('#inline-btn').hide(); $('#inline-btn').hide();
$('main').css({'transition': ''}); $('main').css({'transition': ''});

13
view/tpl/chat.tpl
View File

@ -18,17 +18,12 @@
<div id="chatTopBar"> <div id="chatTopBar">
<div id="chatLineHolder"></div> <div id="chatLineHolder"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div id="chatBottomBar" > <div id="chatBottomBar" >
<div class="tip"></div>
<form id="chat-form" method="post" action="#"> <form id="chat-form" method="post" action="#">
<input type="hidden" name="room_id" value="{{$room_id}}" /> <input type="hidden" name="room_id" value="{{$room_id}}" />
<textarea id="chatText" name="chat_text" class="form-control"></textarea>
<div class="form-group"> <div class="form-group">
<textarea id="chatText" name="chat_text" class="form-control"></textarea>
</div> </div>
<div id="chat-submit-wrapper"> <div id="chat-submit-wrapper">
<div id="chat-submit" class="dropup pull-right"> <div id="chat-submit" class="dropup pull-right">
@ -65,7 +60,7 @@
<div class="btn-group hidden-xs"> <div class="btn-group hidden-xs">
<button id="chat-link-wrapper" class="btn btn-default btn-sm" onclick="chatJotGetLink(); return false;" > <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> <i id="chat-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
</button--> </button>
</div> </div>
{{if $feature_encrypt}} {{if $feature_encrypt}}
<div class="btn-group hidden-xs"> <div class="btn-group hidden-xs">
@ -86,8 +81,6 @@
{{/if}} {{/if}}
</ul> </ul>
</div> </div>
</div> </div>
<div id="chat-rotator-wrapper" class="pull-left"> <div id="chat-rotator-wrapper" class="pull-left">
<div id="chat-rotator"></div> <div id="chat-rotator"></div>
@ -113,7 +106,7 @@ $(document).ready(function() {
}); });
$(window).resize(function () { $(window).resize(function () {
if($('.generic-content-wrapper').hasClass('fullscreen')) { if($('main').hasClass('fullscreen')) {
adjustFullscreenTopBarHeight(); adjustFullscreenTopBarHeight();
} }
else { else {