Commit ebe47416f16223efef4f79dde6983377f778bab3
1 parent
9960ff32
Веталь
Showing
2 changed files
with
14 additions
and
7 deletions
Show diff stats
frontend/web/css/style.css
... | ... | @@ -1499,4 +1499,12 @@ input.custom-radio + label:hover { |
1499 | 1499 | #login-form { |
1500 | 1500 | margin: 50px auto 0 auto; |
1501 | 1501 | } |
1502 | -.wrapper_all {} | |
1503 | 1502 | \ No newline at end of file |
1503 | +.wrapper_all {} | |
1504 | +#bg { | |
1505 | + top: 0 !important; | |
1506 | + z-index: 1 !important; | |
1507 | +} | |
1508 | +.top, .wrap, .bottom, .fotter { | |
1509 | + position: relative; | |
1510 | + z-index: 2; | |
1511 | +} | |
1504 | 1512 | \ No newline at end of file | ... | ... |
frontend/web/js/fix_height.js
... | ... | @@ -14,11 +14,11 @@ window.onload = function() { |
14 | 14 | var heightFooter2 = $('.fotter').outerHeight() |
15 | 15 | var heightFooter = (heightFooter1+heightFooter2) |
16 | 16 | var windowHeight = $(window).height() |
17 | - windowHeight=windowHeight-43 | |
18 | - $('.wrapper_all').css({minHeight:windowHeight-heightHeader-heightFooter}) | |
19 | - | |
20 | -console.log(windowHeight-heightHeader-heightFooter) | |
21 | - console.log((windowHeight-heightHeader-heightFooter)-43) | |
17 | + $('.wrapper_all').css({minHeight:(windowHeight-heightHeader-heightFooter)-60}) | |
18 | + if(($('.wrapper_all .site-error').length)>=1) { | |
19 | + $('.wrapper_all').css({minHeight:(windowHeight-heightHeader-heightFooter)-70}) | |
20 | + } | |
21 | + $('#bg').css({minHeight:windowHeight}) | |
22 | 22 | } |
23 | 23 | |
24 | 24 | function resizeFooterBottom(){ |
... | ... | @@ -34,4 +34,3 @@ console.log(windowHeight-heightHeader-heightFooter) |
34 | 34 | |
35 | 35 | |
36 | 36 | |
37 | - | ... | ... |