mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:55:19 +00:00
ge branch 'master' into dev
This commit is contained in:
commit
2772a72095
3 changed files with 10 additions and 11 deletions
|
@ -1723,9 +1723,7 @@ nav .badge.mail-update:hover {
|
|||
}
|
||||
|
||||
main {
|
||||
-webkit-transition: all 0.25s ease-out;
|
||||
-moz-transition: all 0.25s ease-out;
|
||||
transition: all 0.25s ease-out;
|
||||
transition: all 0.25s ease-in-out;
|
||||
}
|
||||
|
||||
main {
|
||||
|
|
|
@ -55,15 +55,17 @@ $(document).ready(function() {
|
|||
|
||||
function makeFullScreen(full) {
|
||||
if(typeof full=='undefined' || full == true) {
|
||||
$('#fullscreen-btn, header, nav, aside').hide();
|
||||
$('main').css({'width': '100%', 'max-width': 'none', 'left': '0px'});
|
||||
$('#inline-btn').show();
|
||||
$('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'});
|
||||
$('.generic-content-wrapper').addClass('fullscreen');
|
||||
$('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
|
||||
$('#inline-btn').show();
|
||||
|
||||
}
|
||||
else {
|
||||
$('#fullscreen-btn, header, nav, aside').show();
|
||||
$('main').removeAttr('style');
|
||||
$('#inline-btn').hide();
|
||||
$('main').css({'left': '', 'width': '', 'max-width': ''});
|
||||
$('.generic-content-wrapper').removeClass('fullscreen');
|
||||
$('#fullscreen-btn, header, nav, aside').css({'display': ''});
|
||||
$('#inline-btn').hide();
|
||||
$('main').css({'transition': ''});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -119,7 +119,6 @@ $(window).resize(function () {
|
|||
else {
|
||||
adjustInlineTopBarHeight();
|
||||
}
|
||||
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
|
||||
});
|
||||
|
||||
$('#chat-form').submit(function(ev) {
|
||||
|
@ -197,7 +196,7 @@ function addmailtext(data) {
|
|||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue