diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 04d0512..fa7a22a 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -1499,4 +1499,12 @@ input.custom-radio + label:hover { #login-form { margin: 50px auto 0 auto; } -.wrapper_all {} \ No newline at end of file +.wrapper_all {} +#bg { + top: 0 !important; + z-index: 1 !important; +} +.top, .wrap, .bottom, .fotter { + position: relative; + z-index: 2; +} \ No newline at end of file diff --git a/frontend/web/js/fix_height.js b/frontend/web/js/fix_height.js index 93082aa..e36d93b 100644 --- a/frontend/web/js/fix_height.js +++ b/frontend/web/js/fix_height.js @@ -14,11 +14,11 @@ window.onload = function() { var heightFooter2 = $('.fotter').outerHeight() var heightFooter = (heightFooter1+heightFooter2) var windowHeight = $(window).height() - windowHeight=windowHeight-43 - $('.wrapper_all').css({minHeight:windowHeight-heightHeader-heightFooter}) - -console.log(windowHeight-heightHeader-heightFooter) - console.log((windowHeight-heightHeader-heightFooter)-43) + $('.wrapper_all').css({minHeight:(windowHeight-heightHeader-heightFooter)-60}) + if(($('.wrapper_all .site-error').length)>=1) { + $('.wrapper_all').css({minHeight:(windowHeight-heightHeader-heightFooter)-70}) + } + $('#bg').css({minHeight:windowHeight}) } function resizeFooterBottom(){ @@ -34,4 +34,3 @@ console.log(windowHeight-heightHeader-heightFooter) - -- libgit2 0.21.4