Commit 93b9d0c1254ac0ac8264ad554d3de6997159ab3b
Merge branch 'branch' of http://192.168.1.195:9998/web_developers/javaplatform into branch
# Conflicts: # css/libCss/common.css
Showing
2 changed files
with
13 additions
and
7 deletions
css/login.css
| @@ -139,7 +139,7 @@ body{ | @@ -139,7 +139,7 @@ body{ | ||
| 139 | height: 42px; | 139 | height: 42px; |
| 140 | width: 98px; | 140 | width: 98px; |
| 141 | background: #ddd; | 141 | background: #ddd; |
| 142 | - border-radius: 4px; | 142 | + border-radius: 4px !important; |
| 143 | margin-left: 10px; | 143 | margin-left: 10px; |
| 144 | } | 144 | } |
| 145 | .imgWrap img { | 145 | .imgWrap img { |
| @@ -158,13 +158,19 @@ body{ | @@ -158,13 +158,19 @@ body{ | ||
| 158 | width: 100%; | 158 | width: 100%; |
| 159 | height: 40px; | 159 | height: 40px; |
| 160 | } | 160 | } |
| 161 | -.login-foot .btn{ | 161 | +.login-foot .loginbtn{ |
| 162 | height: 40px; | 162 | height: 40px; |
| 163 | width: 148px; | 163 | width: 148px; |
| 164 | background: #26be96; | 164 | background: #26be96; |
| 165 | - border-radius: 20px; | 165 | + border-radius: 20px !important; |
| 166 | color: #fff; | 166 | color: #fff; |
| 167 | font-size:18px; | 167 | font-size:18px; |
| 168 | - margin: 0 auto; | ||
| 169 | - display: block; | 168 | + margin-left: 216px; |
| 169 | + border: none; | ||
| 170 | + outline: none; | ||
| 171 | +} | ||
| 172 | +.verification-logo { | ||
| 173 | + position: absolute; | ||
| 174 | + right: 5px; | ||
| 175 | + top: 14px; | ||
| 170 | } | 176 | } |
| 171 | \ No newline at end of file | 177 | \ No newline at end of file |
login.html
| @@ -45,14 +45,14 @@ | @@ -45,14 +45,14 @@ | ||
| 45 | <input class="ver-control verification-input float-left" type="text" autocomplete="off" placeholder="请输入验证码" name="" maxlength="4" id="login_imgCode_value"> | 45 | <input class="ver-control verification-input float-left" type="text" autocomplete="off" placeholder="请输入验证码" name="" maxlength="4" id="login_imgCode_value"> |
| 46 | </div> | 46 | </div> |
| 47 | <span class="imgWrap float-left"> | 47 | <span class="imgWrap float-left"> |
| 48 | - <img src="" id="login_imgCode"> | 48 | + <!--<img src="" id="login_imgCode">--> |
| 49 | </span> | 49 | </span> |
| 50 | </div> | 50 | </div> |
| 51 | <!--error --> | 51 | <!--error --> |
| 52 | <div class="login_error_ifo"></div> | 52 | <div class="login_error_ifo"></div> |
| 53 | <!--btn login--> | 53 | <!--btn login--> |
| 54 | <div class="login-foot"> | 54 | <div class="login-foot"> |
| 55 | - <button type="button" class="btn uppercase" id="login-btn">登录</button> | 55 | + <button type="button" class="loginbtn" id="login-btn">登录</button> |
| 56 | </div> | 56 | </div> |
| 57 | </div> | 57 | </div> |
| 58 | </div> | 58 | </div> |