diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7f135293ef..277cd9fed9 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -3934,24 +3934,6 @@ i.size-32.icon-new-work{ .bottom_actions .form-group{ margin-bottom: 10px; } -.bottom_actions_fixed { - position: fixed; - z-index: 9999; - bottom: 0; - left: 0px; - margin-bottom: 0px; - padding-top: 20px; - padding-bottom: 10px; - border-top: 1px solid #DCE4EC; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #f6f6f6 47%, #ededed 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); - background: -o-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); - background: -ms-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); - background: linear-gradient(to bottom, #ffffff 0%,#f6f6f6 47%,#ededed 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); -} .sessions-items{ list-style: none; padding: 0; @@ -5681,6 +5663,18 @@ footer{ font-size: 12px; padding-top: 10px; } +.bottom_actions_fixed { + position: fixed; + z-index: 9999; + bottom: 0; + left: 0px; + margin-bottom: 0px; + padding-top: 20px; + padding-bottom: 10px; + border-top: 1px solid #DCE4EC; + background: #ffffff; + width: 100%; +} /* CSS NEW TOP ******************************************************************************/ /* CSS Responsive */ @media (min-width: 1025px) and (max-width: 1200px) { diff --git a/app/cache/.htaccess b/app/cache/.htaccess old mode 100755 new mode 100644 diff --git a/main/template/default/layout/header.js.tpl b/main/template/default/layout/header.js.tpl index 7abc391f19..3c9677f6d2 100644 --- a/main/template/default/layout/header.js.tpl +++ b/main/template/default/layout/header.js.tpl @@ -242,6 +242,20 @@ $(window).resize(function() { $(document).scroll(function() { + var valor = $('body').outerHeight() - 700; + + if ($(this).scrollTop() > 100) { + $('.bottom_actions').addClass('bottom_actions_fixed'); + } else { + $('.bottom_actions').removeClass('bottom_actions_fixed'); + } + + if ($(this).scrollTop() > valor) { + $('.bottom_actions').removeClass('bottom_actions_fixed'); + } else { + $('.bottom_actions').addClass('bottom_actions_fixed'); + } + //Exercise warning fixed at the top var fixed = $("#exercise_clock_warning"); if (fixed.length) { @@ -289,37 +303,9 @@ $(document).scroll(function() { } } - // Bottom actions. - if ($('.bottom_actions').length) { - if (!$('.bottom_actions').attr('data-top')) { - // If already fixed, then do nothing - if ($('.bottom_actions').hasClass('bottom_actions_fixed')) return; - - // Remember top position - var offset = $('.bottom_actions').offset(); - $('.bottom_actions').attr('data-top', offset.top); - } - - if ($('.bottom_actions').attr('data-top') > $('body').outerHeight()) { - if ( ($('.bottom_actions').attr('data-top') - $('body').outerHeight() - $('.bottom_actions').outerHeight()) >= $(this).scrollTop()) { - $('.bottom_actions').addClass('bottom_actions_fixed'); - $('.bottom_actions').css("width", "100%"); - } else { - $('.bottom_actions').css("width", ""); - $('.bottom_actions').removeClass('bottom_actions_fixed'); - } - } else { - if ( ($('.bottom_actions').attr('data-top') - $('.bottom_actions').outerHeight()) <= $(this).scrollTop()) { - $('.bottom_actions').addClass('bottom_actions_fixed'); - $('.bottom_actions').css("width", "100%"); - } else { - $('.bottom_actions').removeClass('bottom_actions_fixed'); - $('.bottom_actions').css("width", ""); - } - } - } }); + function get_url_params(q, attribute) { var vars; var hash;