Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/web/staticres/css/swordfish.css

@@ -265,14 +265,14 @@ a:focus, a:hover{
 	display: inline-block;
 	height: inherit;
 	vertical-align: top;
-	height: 604px;
+	height: 552px;
 }
 .swordfish-guide{
 	padding-left: 20px;
 	padding-right: 20px;
 }
 .swordfish-guide .carousel-inner{
-	width: 813px;
+	width: 825px;
 	left: 50%;
 	margin-left: -406.4px;
 }

core/src/web/templates/common/swordfishhead.html

@@ -45,7 +45,7 @@ function b_afterLogin(flag,result){
 }
 function swordfishLayoutInit(){
 	if(document.body.scrollHeight <= document.body.clientHeight){
-		$(".b-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
+		$(".b-left").height(document.body.clientHeight - $(".b-head").height() - $("#qfw-bottom").height() - 60);
 		webSiteInit();
 	}
 }