From f35dd76d18a8f6d7f20d07a4ef42be35c41e04d3 Mon Sep 17 00:00:00 2001
From: Веталь <icemate.job@gmail.com>
Date: Wed, 25 May 2016 17:25:55 +0300
Subject: [PATCH] Веталь

---
 frontend/web/css/style.css    |  2 +-
 frontend/web/js/fix_height.js | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 96bc8c7..04d0512 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -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%;}
diff --git a/frontend/web/js/fix_height.js b/frontend/web/js/fix_height.js
index dad4a10..93082aa 100644
--- a/frontend/web/js/fix_height.js
+++ b/frontend/web/js/fix_height.js
@@ -1,4 +1,4 @@
-$(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(){
 			})
 		}
 	}
-})
+}
 
 
 
--
libgit2 0.21.4