Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

watero-rst-web/src/main/webapp/WEB-INF/views/login.ftl

@@ -42,11 +42,6 @@
         <form class="form form-horizontal" method="post">
             <div class="row cl">
                 <div class="formControls col-8 col-offset-3">
-                   <h3>欢迎登录</h3>
-                </div>
-            </div>
-            <div class="row cl">
-                <div class="formControls col-8 col-offset-3">
                     <input id="login_name" autocomplete="off" name="login_name" type="text" placeholder="请输入账户" class="input-text size-L user_count">
                 </div>
             </div>
@@ -68,7 +63,7 @@
             </div>
             <div class="row loginbox_btn">
                 <div class="formControls col-8 col-offset-3">
-                    <input name="" id="login-btn" type="submit" class="btn btn-block size-L my-btn-login" value="&nbsp;登&nbsp;&nbsp;&nbsp;&nbsp;录&nbsp;">
+                    <input name="" id="login-btn" type="submit" class="btn btn-block btn-primary radius size-L my-btn-login" value="&nbsp;登&nbsp;&nbsp;&nbsp;&nbsp;录&nbsp;">
                 </div>
             </div>
         </form>

watero-rst-web/src/main/webapp/common/css/login/login.css

@@ -1,11 +1,11 @@
-.loginWraper{background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat center top;background-size:100% 100%;}
-.loginBox{padding-top: 0px;padding-bottom: 20px;}
+.loginWraper{background: #fff url(../../images/login/admin-login-bg.png) no-repeat top;}
+.loginBox{padding-top: 88px;background: url(../../images/login/admin-loginform-bg.png) top right no-repeat;background-size:90% 80%;padding-bottom: 50px;}
 .input-text, .textarea {border: 0;border-bottom: solid 1px #ddd;text-indent: 2em;}
 .user_count{background: url(../../images/login/ipt_head.png) left center no-repeat /30px !important;}
 .pass_word{background: url(../../images/login/ipt_suo.png) left center no-repeat /30px !important;}
 .validate{background: url(../../images/login/ipt_img.png) left center no-repeat /30px !important;width:210px !important;}
-.loginbox_btn{margin-top:60px !important;}
-.my-btn-login{width: 90% !important;background-color: #cfb794;border-radius: 25px;color: #fff;}
+.loginbox_btn{margin-top: 80px !important;}
+.my-btn-login{width: 90% !important;}
 @media screen and (orientation:portrait) and (-webkit-min-device-pixel-ratio:2){
 /*mobile竖屏*/
 .loginWraper {background: #fff url(../../images/login/admin-login-bg.png) no-repeat top right;background-size: auto 50%;}

watero-rst-web/src/main/webapp/common/static/h-ui.admin/css/H-ui.login.css

@@ -17,7 +17,7 @@ body{font-size:14px}
 .header{top:0; height:60px; background:#426374 url(../images/logo.png) no-repeat 0 center}
 
 .loginWraper{ position:absolute;width:100%; left:0; top:0; bottom:0; right:0; z-index:1; background:#3283AC url(../images/admin-login-bg.jpg) no-repeat center}
-.loginBox{ position:absolute; width:617px; height:330px; right:12%; top:50%; margin-top:-184px; padding-top:38px}
+.loginBox{ position:absolute; width:617px; height:330px; background:url(../images/admin-loginform-bg.png) no-repeat; left:50%; top:50%; margin-left:-309px; margin-top:-184px; padding-top:38px}
 @media (max-width:617px) {
 	.loginbox{ width:100%; position:static; margin-top:0; margin-left:0;}
 }