Xiao_123 6 mesi fa
parent
commit
67546da060

+ 2 - 1
src/layout/personal/navBar.vue

@@ -33,7 +33,8 @@
         
         <div class="d-flex user-nav">
           <div class="btns d-flex align-center" v-if="!getToken() && showLoginBtn">
-            <v-btn class="half-button" border color="primary" size="small" @click="handleLogin">{{ $t('login.loginOrRegister') }}</v-btn>
+            <!-- <v-btn class="half-button" border color="primary" size="small" @click="handleLogin">{{ $t('login.loginOrRegister') }}</v-btn> -->
+            <v-btn color="primary" style="color: #fff !important; background-color: #00897B;" @click="handleLogin">{{ $t('login.loginOrRegister') }}</v-btn>
           </div>
           
           <!-- 头像用户名 -->

+ 17 - 20
src/styles/personal/navBar.css

@@ -7,6 +7,23 @@
   }
 }
 
+.vipBox .avatar {
+  border: 1px solid #b29701;
+}
+
+.vipBox .avatar:hover {
+  border: 2px solid var(--v-primary-base);
+}
+
+.vipBox .userName {
+  font-weight: bold;
+  background: -webkit-linear-gradient(45deg, #333, #b29701);
+  background: linear-gradient(45deg, #333, #b29701);
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
 .user-nav .nav-resume-tools {
   display: inline-block;
   vertical-align: middle;
@@ -126,26 +143,6 @@
   font-weight: 700;
 }
 
-.user-nav .btns .btn-outline {
-  border-radius: 8px;
-  text-align: center;
-  font-size: 14px;
-  height: 26px;
-  line-height: 26px;
-  min-width: 0;
-  padding: 0 11px;
-  margin-left: 14px;
-  background-color: transparent;
-}
-
-.user-nav .btn {
-  display: inline-block;
-  box-sizing: content-box;
-  border: 1px solid var(--v-primary-base);
-  letter-spacing: 1px;
-  cursor: pointer;
-}
-
 .user-nav a {
   text-decoration: none;
 }

File diff suppressed because it is too large
+ 0 - 0
src/styles/personal/navBar.min.css


+ 14 - 14
src/styles/personal/navBar.scss

@@ -140,22 +140,22 @@
   // line-height: 49px;
 }
 .user-nav .btns .btn-outline {
-  border-radius: 8px;
-  text-align: center;
-  font-size: 14px;
-  height: 26px;
-  line-height: 26px;
-  min-width: 0;
-  padding: 0 11px;
-  margin-left: 14px;
-  background-color: transparent;
+  // border-radius: 8px;
+  // text-align: center;
+  // font-size: 14px;
+  // height: 26px;
+  // line-height: 26px;
+  // min-width: 0;
+  // padding: 0 11px;
+  // margin-left: 14px;
+  // background-color: transparent;
 }
 .user-nav .btn {
-  display: inline-block;
-  box-sizing: content-box;
-  border: 1px solid var(--v-primary-base);
-  letter-spacing: 1px;
-  cursor: pointer;
+  // display: inline-block;
+  // box-sizing: content-box;
+  // border: 1px solid var(--v-primary-base);
+  // letter-spacing: 1px;
+  // cursor: pointer;
 }
 .user-nav a {
   text-decoration: none;

+ 2 - 2
src/views/common/loginDialog.vue

@@ -32,8 +32,8 @@
           {{ $t('login.loginOrRegister') }}
         </v-btn>
         <div class="login-tips mt-3 font-size-14">
-            <v-icon v-if="isAgree" size="18" color="primary" class="mr-2" @click="isAgree = !isAgree">mdi-check-circle</v-icon>
-            <v-icon v-else size="18" color="grey" class="mr-2" @click="isAgree = !isAgree">mdi-circle-outline</v-icon>
+            <v-icon v-if="isAgree" size="25" color="primary" class="mr-1" @click="isAgree = !isAgree">mdi-check-circle</v-icon>
+            <v-icon v-else size="25" color="grey" class="mr-1" @click="isAgree = !isAgree">mdi-circle-outline</v-icon>
             {{ $t('login.agreeLogin') }}
             <span class="color" style="cursor: pointer;" @click="windowOpen('/userAgreement')"> [{{ $t('login.userAgreement') }}] </span>和
             <span class="color" style="cursor: pointer;" @click="windowOpen('/privacyPolicy')">[{{ $t('login.privacyPolicy') }}]</span>

+ 2 - 2
src/views/login/index.vue

@@ -61,8 +61,8 @@
             {{ $t('login.login') }}
           </v-btn>
           <div class="login-tips mt-3">
-              <v-icon v-if="isAgree" size="18" color="primary" class="mr-2" @click="isAgree = !isAgree">mdi-check-circle</v-icon>
-              <v-icon v-else size="18" color="grey" class="mr-2" @click="isAgree = !isAgree">mdi-circle-outline</v-icon>
+              <v-icon v-if="isAgree" size="25" color="primary" class="mr-1" @click="isAgree = !isAgree">mdi-check-circle</v-icon>
+              <v-icon v-else size="25" color="grey" class="mr-1" @click="isAgree = !isAgree">mdi-circle-outline</v-icon>
               {{ $t('login.agreeLogin') }}
               <span class="color" style="cursor: pointer;" @click="windowOpen('/userAgreement')"> [{{ $t('login.userAgreement') }}] </span>和
               <span class="color" style="cursor: pointer;" @click="windowOpen('/privacyPolicy')">[{{ $t('login.privacyPolicy') }}]</span>

+ 2 - 2
src/views/register/person.vue

@@ -9,8 +9,8 @@
       <div v-if="!isMobile" class="font-size-14 tips color-primary cursor-pointer text-end" @click="router.push('/login')">已有账号?去登录</div>
       <v-btn :loading="loading" color="primary" class="white--text mt-5" min-width="370" @click="handleRegister">{{ isCompany ? '下一步' : '注册' }}</v-btn>
       <div class="login-tips mt-3" v-if="!isCompany">
-        <v-icon v-if="isAgree" size="18" color="primary" class="mr-2" @click="isAgree = !isAgree">mdi-check-circle</v-icon>
-        <v-icon v-else size="18" color="grey" class="mr-2" @click="isAgree = !isAgree">mdi-circle-outline</v-icon>
+        <v-icon v-if="isAgree" size="25" color="primary" class="mr-1" @click="isAgree = !isAgree">mdi-check-circle</v-icon>
+        <v-icon v-else size="25" color="grey" class="mr-1" @click="isAgree = !isAgree">mdi-circle-outline</v-icon>
         点击注册即代表您同意
         <span class="color" style="cursor: pointer;" @click="windowOpen('/userAgreement')"> [{{ $t('login.userAgreement') }}] </span>和
         <span class="color" style="cursor: pointer;" @click="windowOpen('/privacyPolicy')">[{{ $t('login.privacyPolicy') }}]</span>

Some files were not shown because too many files changed in this diff