Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php

src/frontend/web/css/login.css

@@ -212,7 +212,7 @@ a,a:hover,a:link {
 }
 
 .btn-reg {
-    width: 300px;
+    width: 290px;
     height: 44px;
     line-height: 44px;
     padding: 0;
@@ -225,7 +225,7 @@ a,a:hover,a:link {
 }
 
 .btn-log {
-    width: 300px;
+    width: 290px;
     height: 44px;
     line-height: 44px;
     padding: 0;
@@ -237,7 +237,7 @@ a,a:hover,a:link {
     color: #fff;
 }
 .part-wap {
-    width: 300px;
+    width: 290px;
     margin: 20px auto 0;
     text-align: left;
 }