浏览代码

Merge remote-tracking branch 'origin/dev' into dev

shicr 8 年之前
父节点
当前提交
432876a073
共有 1 个文件被更改,包括 10 次插入5 次删除
  1. 10 5
      donate-service/src/main/webapp/WEB-INF/views/personalCenter.html

+ 10 - 5
donate-service/src/main/webapp/WEB-INF/views/personalCenter.html

@@ -692,23 +692,28 @@
             position: relative;
             height: 48px;
             line-height: 48px;
+            overflow: hidden;
+            width: 100%;
+            border-bottom: 1px solid #e7e7e7;
         }
         .x-login-tab {
-            float: left;
+            margin-top: -4px;
             width: 173px;
             font-size: 18px;
             text-align: center;
-            border-bottom: 1px solid #e7e7e7;
             background: #fff;
+            border-bottom: 2px solid transparent;
         }
         .x-login-tab a {
             padding: 13px 10px;
             font-size: 16px;
             color: #777777;
         }
+        .x-login-tab.active,.x-login-tab:hover{
+            border-bottom: 2px solid #5078cb;
+        }
         .x-login-tab.active a,.x-login-tab:hover a{
             color: #5078cb;
-            border-bottom: 2px solid #5078cb;
         }
         .x-login-form, .x-login-qrcode {
             padding: 20px;
@@ -1198,10 +1203,10 @@
             <div class="body modal-body">
                 <div class="x-login">
                     <div class="x-login-header">
-                        <div class="x-login-tab" aria-controls="qrcode-wrap" aria-left="0">
+                        <div class="x-login-tab fl" aria-controls="qrcode-wrap" aria-left="0">
                             <a href="javascript:void(0)"> 扫码登录 </a>
                         </div>
-                        <div class="x-login-tab active" aria-controls="form-wrap" aria-left="50%">
+                        <div class="x-login-tab active fr" aria-controls="form-wrap" aria-left="50%">
                             <a href="javascript:void(0)"> 账户登录 </a>
                         </div>
                     </div>