aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-03 00:19:30 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-03 00:19:30 +0200
commit2772a7209594bf239200e81e48d997d49dea2daf (patch)
treeae401630a4883e8dc772222d9eccc862eb3df9cd
parent381cc3e6f806bc99a2c4a529c34a6e4e2de15f28 (diff)
parente361ee9253d0a235a6b54fae1a1d6a25a6541342 (diff)
downloadvolse-hubzilla-2772a7209594bf239200e81e48d997d49dea2daf.tar.gz
volse-hubzilla-2772a7209594bf239200e81e48d997d49dea2daf.tar.bz2
volse-hubzilla-2772a7209594bf239200e81e48d997d49dea2daf.zip
ge branch 'master' into dev
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/theme/redbasic/js/redbasic.js14
-rw-r--r--view/tpl/chat.tpl3
3 files changed, 10 insertions, 11 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6feb1154b..9dcfcdf3e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -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 {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 21b51af36..73628ebd9 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -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': ''});
}
}
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 633437069..eb219f128 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -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'));
}