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

ge branch 'master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2016-04-03 00:19:30 +02:00
commit 2772a72095
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1723,9 +1723,7 @@ nav .badge.mail-update:hover {
} }
main { main {
-webkit-transition: all 0.25s ease-out; transition: all 0.25s ease-in-out;
-moz-transition: all 0.25s ease-out;
transition: all 0.25s ease-out;
} }
main { main {

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

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

3
view/tpl/chat.tpl
View File

@ -119,7 +119,6 @@ $(window).resize(function () {
else { else {
adjustInlineTopBarHeight(); adjustInlineTopBarHeight();
} }
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
}); });
$('#chat-form').submit(function(ev) { $('#chat-form').submit(function(ev) {
@ -197,7 +196,7 @@ function addmailtext(data) {
} }
function adjustFullscreenTopBarHeight() { function adjustFullscreenTopBarHeight() {
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23); $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16);
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight')); $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
} }