Commit f35dd76d18a8f6d7f20d07a4ef42be35c41e04d3
1 parent
9bd35d67
Веталь
Showing
2 changed files
with
14 additions
and
10 deletions
Show diff stats
frontend/web/css/style.css
| @@ -216,7 +216,7 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f | @@ -216,7 +216,7 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f | ||
| 216 | .rightbar{float:right;width:380px;margin-left:40px;} | 216 | .rightbar{float:right;width:380px;margin-left:40px;} |
| 217 | .rightbar.basket_rightbar{margin-right: 20px;} | 217 | .rightbar.basket_rightbar{margin-right: 20px;} |
| 218 | .rightbar2{float:right;width:320px;} | 218 | .rightbar2{float:right;width:320px;} |
| 219 | -.content {overflow:hidden;min-height:500px;} | 219 | +.content {overflow:hidden;} |
| 220 | * html .content{height:1%;} | 220 | * html .content{height:1%;} |
| 221 | .content2 {overflow:hidden;} | 221 | .content2 {overflow:hidden;} |
| 222 | * html .content2{height:1%;} | 222 | * html .content2{height:1%;} |
frontend/web/js/fix_height.js
| 1 | -$(document).ready(function(){ | 1 | +window.onload = function() { |
| 2 | autoHeight(); | 2 | autoHeight(); |
| 3 | function autoHeight() { | 3 | function autoHeight() { |
| 4 | 4 | ||
| @@ -6,15 +6,19 @@ $(document).ready(function(){ | @@ -6,15 +6,19 @@ $(document).ready(function(){ | ||
| 6 | resizeFooterBottom(); | 6 | resizeFooterBottom(); |
| 7 | 7 | ||
| 8 | function footerBottom(){ | 8 | function footerBottom(){ |
| 9 | - var heightHeader1 = $('nav.top').height() | ||
| 10 | - var heightHeader2 = $('.section-box-header').height() | ||
| 11 | - var heightHeader3 = $('.menu').height() | ||
| 12 | - var heightHeader = heightHeader1+heightHeader2+heightHeader3 | ||
| 13 | - var heightFooter1 = $('.bottom').height() | ||
| 14 | - var heightFooter2 = $('.fotter').height() | ||
| 15 | - var heightFooter = heightFooter1+heightFooter2 | 9 | + var heightHeader1 = $('nav.top').outerHeight() |
| 10 | + var heightHeader2 = $('.header').outerHeight() | ||
| 11 | + var heightHeader3 = $('.menu').outerHeight() | ||
| 12 | + var heightHeader = (heightHeader1+heightHeader2+heightHeader3) | ||
| 13 | + var heightFooter1 = $('.bottom').outerHeight() | ||
| 14 | + var heightFooter2 = $('.fotter').outerHeight() | ||
| 15 | + var heightFooter = (heightFooter1+heightFooter2) | ||
| 16 | var windowHeight = $(window).height() | 16 | var windowHeight = $(window).height() |
| 17 | + windowHeight=windowHeight-43 | ||
| 17 | $('.wrapper_all').css({minHeight:windowHeight-heightHeader-heightFooter}) | 18 | $('.wrapper_all').css({minHeight:windowHeight-heightHeader-heightFooter}) |
| 19 | + | ||
| 20 | +console.log(windowHeight-heightHeader-heightFooter) | ||
| 21 | + console.log((windowHeight-heightHeader-heightFooter)-43) | ||
| 18 | } | 22 | } |
| 19 | 23 | ||
| 20 | function resizeFooterBottom(){ | 24 | function resizeFooterBottom(){ |
| @@ -23,7 +27,7 @@ $(document).ready(function(){ | @@ -23,7 +27,7 @@ $(document).ready(function(){ | ||
| 23 | }) | 27 | }) |
| 24 | } | 28 | } |
| 25 | } | 29 | } |
| 26 | -}) | 30 | +} |
| 27 | 31 | ||
| 28 | 32 | ||
| 29 | 33 |