Merge remote-tracking branch 'origin/master'

Administrator
2 parents 3305fb79 f35dd76d
Showing 2 changed files with 14 additions and 10 deletions Show diff stats
frontend/web/css/style.css
frontend/web/js/fix_height.js
@@ -216,7 +216,7 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
 .rightbar{float:right;width:380px;margin-left:40px;}
 .rightbar.basket_rightbar{margin-right: 20px;}
 .rightbar2{float:right;width:320px;}
-.content {overflow:hidden;min-height:500px;}
+.content {overflow:hidden;}
 * html .content{height:1%;}
 .content2 {overflow:hidden;}
 * html .content2{height:1%;}
-$(document).ready(function(){
+window.onload = function() {
 	autoHeight();
 	function autoHeight() {
@@ -6,15 +6,19 @@ $(document).ready(function(){
 		resizeFooterBottom();
 		function footerBottom(){
-			var heightHeader1 = $('nav.top').height()
-			var heightHeader2 = $('.section-box-header').height()
-			var heightHeader3 = $('.menu').height()
-			var heightHeader = heightHeader1+heightHeader2+heightHeader3
-			var heightFooter1 = $('.bottom').height()
-			var heightFooter2 = $('.fotter').height()
-			var heightFooter = heightFooter1+heightFooter2
+			var heightHeader1 = $('nav.top').outerHeight()
+			var heightHeader2 = $('.header').outerHeight()
+			var heightHeader3 = $('.menu').outerHeight()
+			var heightHeader = (heightHeader1+heightHeader2+heightHeader3)
+			var heightFooter1 = $('.bottom').outerHeight()
+			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)
 		}
 		function resizeFooterBottom(){
@@ -23,7 +27,7 @@ $(document).ready(function(){
 			})
 		}
 	}
-})
+}