diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-02 21:07:34 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-02 21:07:34 -0700 |
| commit | 81ba293561a703988b23e676a39ab24bdd849b87 (patch) | |
| tree | 75f385790f42b9f44fd598fbad6b1bd90cbdb487 | |
| parent | 8b3c099a123d710ba341b3e2513bb5cf04ff5b84 (diff) | |
| parent | e361ee9253d0a235a6b54fae1a1d6a25a6541342 (diff) | |
| download | volse-hubzilla-81ba293561a703988b23e676a39ab24bdd849b87.tar.gz volse-hubzilla-81ba293561a703988b23e676a39ab24bdd849b87.tar.bz2 volse-hubzilla-81ba293561a703988b23e676a39ab24bdd849b87.zip | |
Merge branch 'master' into dev
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 14 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 3 |
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')); } |