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

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

@@ -76,8 +76,8 @@
 	margin:0 0px 0 12px;	
 }
 .login-logo{
-	width: 161px;
-	height: 68px;
+	width: 156px;
+	height: 55px;
 	margin-left:150px;
 	margin-top:20px;
 }