diff --git a/src/login/bklogin/templates/account/login_ce.html b/src/login/bklogin/templates/account/login_ce.html index 8a685de0d..6007031bb 100755 --- a/src/login/bklogin/templates/account/login_ce.html +++ b/src/login/bklogin/templates/account/login_ce.html @@ -104,9 +104,9 @@ {% trans '技术支持' %} | {% trans '社区论坛' %} | {% trans '产品官网' %} - | + | {% trans '关注我们' %} - +

Copyright © 2012-{{NOW.year}} Tencent BlueKing. All Rights Reserved. V7.0

diff --git a/src/login/locale/en/LC_MESSAGES/django.po b/src/login/locale/en/LC_MESSAGES/django.po index d2178c15e..9b58d728a 100755 --- a/src/login/locale/en/LC_MESSAGES/django.po +++ b/src/login/locale/en/LC_MESSAGES/django.po @@ -336,6 +336,10 @@ msgstr "img/logo_ce/logo_en.png" msgid "请修改密码" msgstr "Change Password" +#: bklogin/templates/account/login_ce.html:104 +msgid "技术支持" +msgstr "Technical support" + #: bklogin/templates/account/login_ce.html:104 msgid "QQ群支持" msgstr "QQ group" diff --git a/src/login/static/css_ce/login.css b/src/login/static/css_ce/login.css index 8437120da..ee6008202 100755 --- a/src/login/static/css_ce/login.css +++ b/src/login/static/css_ce/login.css @@ -512,12 +512,12 @@ input[type="number"]::-webkit-outer-spin-button { .follow-us .qr-box { position: absolute; bottom: 25px; - right: 18px; + right: -20px; display: none; width: 100px; height: 100px; background-color: #fff; - z-index: 111; + z-index: 101; } .follow-us .qr-box::before { content: ""; diff --git a/src/login/static/css_ce/login.min.css b/src/login/static/css_ce/login.min.css index df77b9d3d..b118a50b5 100755 --- a/src/login/static/css_ce/login.min.css +++ b/src/login/static/css_ce/login.min.css @@ -1,3 +1,3 @@ *{box-sizing:border-box}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,i,pre,form,fieldset,input,blockquote,th,td,p,span,button,textarea,b{margin:0;padding:0}html,body{font-size:14px;font-family:"Microsoft YaHei";height:100%;position:relative}a{text-decoration:none;-webkit-transition:all .5s;-moz-transition:all .5s;-ms-transition:all .5s;transition:all .5s}button{text-decoration:none;-webkit-transition:all .5s;-moz-transition:all .5s;-ms-transition:all .5s;transition:all .5s}a:hover{text-decoration:none}ul,ol,li{list-style:none}h1,h2,h3,h4,h5,h6{font-weight:normal}input::-webkit-input-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}input:-moz-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}input::-moz-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}input:-ms-input-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}textarea::-webkit-input-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}textarea:-moz-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}textarea::-moz-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}textarea:-ms-input-placeholder{font-family:"Microsoft YaHei";color:#c4c6cc}.pb110{padding-bottom:110px}.clearfix:before,.clearfix:after{content:"";display:table}.clearfix:after{clear:both}.clearfix{*zoom:1}.hide{display:none!important;visibility:hidden}input[type="number"]{-moz-appearance:textfield}input,select{background:0}input[disabled]{background:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.page-content{height:100%;width:100%;position:relative;margin:0 auto;background-color:#ebf2fa}#particles-js{height:100%}.page-content .right-top{width:52%;height:0;position:absolute;right:0;top:0;padding-bottom:10%;background-color:#ebf2fa}.page-content .right-top img{width:100%}.page-content .right-bottom{width:31%;height:0;position:absolute;right:1%;bottom:0;padding-bottom:15%}.page-content .right-bottom img{width:100%}.page-content .left-bottom{width:35%;height:0;position:absolute;left:0;bottom:0;padding-bottom:12%}.page-content .left-bottom img{width:100%}.page-content .login-from{width:400px;position:absolute;top:17%;left:50%;margin-left:-200px;z-index:100;overflow:visible;background:#fff;border-radius:8px;box-shadow:0 2px 6px 0 rgba(0,0,0,0.10)}.page-content .login-from .logo-title{opacity:1;padding:39px 0 40px 56px;display:flex;align-items:center;justify-content:flex-start}.page-content .login-from .logo-title .logo-img{height:34px}.page-content .login-from .from-detail{position:relative;padding-bottom:28px}.page-content .login-from .from-detail .is-danger-tip{position:absolute;color:#ea3636;top:11px;left:38px;font-size:12px}.page-content .login-from .from-detail .is-danger-tip .icon-exclamation-circle-shape{margin-right:10px}.page-content .login-from .form-login{width:100%;padding:0 38px}.page-content .login-from .form-login .change-password{margin-top:2px}.page-content .login-from .form-login .change-password span{color:#ea3636}.page-content .login-from .form-login .change-password a{color:#1768ef}.page-content .login-from .form-login.is-danger .group-control p{color:#ff5656}.page-content .login-from .form-login.is-danger .group-control input{border-color:#ff5656;color:#63656e}.page-content .login-from .form-login.is-danger .group-control input:focus{border-color:#ff5656}.page-content .login-from .form-login.is-danger .group-control input::-webkit-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login.is-danger .group-control input:-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login.is-danger .group-control input::-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login.is-danger .group-control input:-ms-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login.certificate-expired .group-control i{color:#cad3dc}.page-content .login-from .form-login.certificate-expired .group-control input{border-color:#dde4eb;color:#63656e}.page-content .login-from .form-login.certificate-expired .group-control input:focus{border-color:#ff5656}.page-content .login-from .form-login.certificate-expired .group-control input::-webkit-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login.certificate-expired .group-control input:-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login.certificate-expired .group-control input::-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login.certificate-expired .group-control input:-ms-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login.certificate-expired .btn-content .login-btn{background:#313b4c;cursor:not-allowed}.page-content .login-from .form-login.certificate-expired .btn-content .login-btn:hover{background:#344157} -.page-content .login-from .form-login .group-control{width:100%;height:40px;border-radius:2px;position:relative}.page-content .login-from .form-login .user{margin-bottom:28px}.page-content .login-from .form-login .group-control i{position:absolute;font-size:16px;top:12px;right:13px;color:#979ba5}.page-content .login-from .form-login .group-control i:hover{cursor:pointer}.page-content .login-from .form-login .group-control input{width:100%;height:100%;outline:0;border:1px solid #c4c6cc;padding:0 40px 0 12px;color:#63656e;border-radius:2px}.page-content .login-from .form-login .action{margin-top:12px}.page-content .login-from .form-login .group-control input:focus{border-color:#3c96ff}.page-content .login-from .form-login .group-control input::-webkit-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login .group-control input:-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login .group-control input::-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login .group-control input:-ms-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login .btn-content{font-size:0;padding-top:28px}.page-content .login-from .form-login .btn-content .login-btn{width:100%;height:42px;display:inline-block;background-color:#3a84ff;border-radius:2px;outline:0;border:0;font-size:14px;line-height:18px;letter-spacing:0;color:#fff;cursor:pointer;float:left}.page-content .login-from .form-login .btn-content .login-btn:hover{background:#3a84ff}.page-content .login-from .form-login .protocol-btn,.page-content .login-from .form-login .password-btn{font-size:14px;letter-spacing:0;color:#63656e;display:inline-block!important;cursor:pointer;float:right}.page-content .login-from .form-login .protocol-btn:hover,.page-content .login-from .form-login .password-btn:hover{color:#1768ef}.language-switcher{display:flex;border-radius:2px;height:24px;line-height:24px;justify-content:end;text-align:right;margin-top:23px}.language-switcher .language-item{width:70px;text-align:center;background:#f5f7fa;transform:skew(-15deg,0deg);display:inline-block;height:24px;cursor:pointer}.language-switcher .language-item:nth-child(1){border-radius:2px 0 0 2px}.language-switcher .language-item:nth-child(2){border-radius:0 2px 2px 0}.language-switcher .language-item .text-active{display:block;width:70px;height:24px;line-height:24px;font-size:12px;transform:skew(15deg,0deg)}.language-switcher .active{background:#e1ecff}.language-switcher .active .text-active{color:#3a84ff}.footer{width:100%;line-height:20px;padding:2% 0;position:absolute;bottom:0;color:#bfcbd7;font-size:12px;text-align:center;background:url(../img/logo_ce/footer.png) no-repeat center;background-size:100% 100%}.footer a{color:#bfcbd7;margin:0 5px}.footer a:hover{color:#fff}.follow-us{position:relative}.follow-us:hover{cursor:pointer}.follow-us:hover .qr-box{display:inline-block}.follow-us .qr-box{position:absolute;bottom:25px;right:18px;display:none;width:100px;height:100px;background-color:#fff;z-index:111}.follow-us .qr-box::before{content:"";width:0;height:0;border-top:6px solid #fff;border-left:6px solid transparent;border-right:6px solid transparent;position:absolute;top:100px;left:50px}.follow-us .qr-box .qr{padding-top:5px}.protocol-pop{position:fixed;top:0;left:0;width:100%;height:100%;display:none;z-index:101}.protocol-pop .protocol-detail{width:1200px;height:700px;background-color:#fff;border-radius:2px;top:10%;left:50%;margin-left:-600px;position:absolute;padding:59px 23px 40px 37px}.protocol-pop .protocol-detail .del-text{position:absolute;top:0;right:0;width:27px;height:27px;line-height:26px;border-radius:50%;text-align:center;margin:4px 4px 0 0;background-repeat:no-repeat;background-size:11px 11px;background-position:50% 50%;cursor:pointer;display:inline-block}.protocol-pop .protocol-detail .del-text:hover{background-color:#f3f3f3}.protocol-pop .protocol-detail .del-text>i{font-size:10px;color:#50525f;font-weight:bold}.protocol-pop .protocol-detail .detail-content{height:536px;overflow-y:auto}.protocol-pop .protocol-detail .detail-content::-webkit-scrollbar{width:6px;height:5px}.protocol-pop .protocol-detail .detail-content::-webkit-scrollbar-thumb{border-radius:20px;background:#a5a5a5;box-shadow:inset 0 0 6px rgba(204,204,204,0.3)}.protocol-pop .protocol-detail .detail-content>.title{text-align:center;font-size:32px;font-weight:normal;font-stretch:normal;line-height:36px;letter-spacing:1px;color:#4f515e;position:relative;margin-bottom:67px}.protocol-pop .protocol-detail .detail-content>.title:after{content:"";position:absolute;width:30px;height:2px;background:#5c7ac6;top:46px;left:50%;margin-left:-15px}.protocol-pop .protocol-detail .detail-content .detail-list{padding-right:23px}.protocol-pop .protocol-detail .detail-content .detail-list>.title{font-weight:bold}.protocol-pop .protocol-detail .detail-content .detail-list P{text-align:left;font-size:12px;line-height:32px;letter-spacing:0;color:#7b7d8a} +.page-content .login-from .form-login .group-control{width:100%;height:40px;border-radius:2px;position:relative}.page-content .login-from .form-login .user{margin-bottom:28px}.page-content .login-from .form-login .group-control i{position:absolute;font-size:16px;top:12px;right:13px;color:#979ba5}.page-content .login-from .form-login .group-control i:hover{cursor:pointer}.page-content .login-from .form-login .group-control input{width:100%;height:100%;outline:0;border:1px solid #c4c6cc;padding:0 40px 0 12px;color:#63656e;border-radius:2px}.page-content .login-from .form-login .action{margin-top:12px}.page-content .login-from .form-login .group-control input:focus{border-color:#3c96ff}.page-content .login-from .form-login .group-control input::-webkit-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login .group-control input:-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login .group-control input::-moz-placeholder{color:#c4c6cc}.page-content .login-from .form-login .group-control input:-ms-input-placeholder{color:#c4c6cc}.page-content .login-from .form-login .btn-content{font-size:0;padding-top:28px}.page-content .login-from .form-login .btn-content .login-btn{width:100%;height:42px;display:inline-block;background-color:#3a84ff;border-radius:2px;outline:0;border:0;font-size:14px;line-height:18px;letter-spacing:0;color:#fff;cursor:pointer;float:left}.page-content .login-from .form-login .btn-content .login-btn:hover{background:#3a84ff}.page-content .login-from .form-login .protocol-btn,.page-content .login-from .form-login .password-btn{font-size:14px;letter-spacing:0;color:#63656e;display:inline-block!important;cursor:pointer;float:right}.page-content .login-from .form-login .protocol-btn:hover,.page-content .login-from .form-login .password-btn:hover{color:#1768ef}.language-switcher{display:flex;border-radius:2px;height:24px;line-height:24px;justify-content:end;text-align:right;margin-top:23px}.language-switcher .language-item{width:70px;text-align:center;background:#f5f7fa;transform:skew(-15deg,0deg);display:inline-block;height:24px;cursor:pointer}.language-switcher .language-item:nth-child(1){border-radius:2px 0 0 2px}.language-switcher .language-item:nth-child(2){border-radius:0 2px 2px 0}.language-switcher .language-item .text-active{display:block;width:70px;height:24px;line-height:24px;font-size:12px;transform:skew(15deg,0deg)}.language-switcher .active{background:#e1ecff}.language-switcher .active .text-active{color:#3a84ff}.footer{width:100%;line-height:20px;padding:2% 0;position:absolute;bottom:0;color:#bfcbd7;font-size:12px;text-align:center;background:url(../img/logo_ce/footer.png) no-repeat center;background-size:100% 100%}.footer a{color:#bfcbd7;margin:0 5px}.footer a:hover{color:#fff}.follow-us{position:relative}.follow-us:hover{cursor:pointer}.follow-us:hover .qr-box{display:inline-block}.follow-us .qr-box{position:absolute;bottom:25px;right:-20px;display:none;width:100px;height:100px;background-color:#fff;z-index:101}.follow-us .qr-box::before{content:"";width:0;height:0;border-top:6px solid #fff;border-left:6px solid transparent;border-right:6px solid transparent;position:absolute;top:100px;left:50px}.follow-us .qr-box .qr{padding-top:5px}.protocol-pop{position:fixed;top:0;left:0;width:100%;height:100%;display:none;z-index:101}.protocol-pop .protocol-detail{width:1200px;height:700px;background-color:#fff;border-radius:2px;top:10%;left:50%;margin-left:-600px;position:absolute;padding:59px 23px 40px 37px}.protocol-pop .protocol-detail .del-text{position:absolute;top:0;right:0;width:27px;height:27px;line-height:26px;border-radius:50%;text-align:center;margin:4px 4px 0 0;background-repeat:no-repeat;background-size:11px 11px;background-position:50% 50%;cursor:pointer;display:inline-block}.protocol-pop .protocol-detail .del-text:hover{background-color:#f3f3f3}.protocol-pop .protocol-detail .del-text>i{font-size:10px;color:#50525f;font-weight:bold}.protocol-pop .protocol-detail .detail-content{height:536px;overflow-y:auto}.protocol-pop .protocol-detail .detail-content::-webkit-scrollbar{width:6px;height:5px}.protocol-pop .protocol-detail .detail-content::-webkit-scrollbar-thumb{border-radius:20px;background:#a5a5a5;box-shadow:inset 0 0 6px rgba(204,204,204,0.3)}.protocol-pop .protocol-detail .detail-content>.title{text-align:center;font-size:32px;font-weight:normal;font-stretch:normal;line-height:36px;letter-spacing:1px;color:#4f515e;position:relative;margin-bottom:67px}.protocol-pop .protocol-detail .detail-content>.title:after{content:"";position:absolute;width:30px;height:2px;background:#5c7ac6;top:46px;left:50%;margin-left:-15px}.protocol-pop .protocol-detail .detail-content .detail-list{padding-right:23px}.protocol-pop .protocol-detail .detail-content .detail-list>.title{font-weight:bold}.protocol-pop .protocol-detail .detail-content .detail-list P{text-align:left;font-size:12px;line-height:32px;letter-spacing:0;color:#7b7d8a} .protocol-pop .protocol-detail .consent-content{text-align:center;margin-top:25px}.protocol-pop .protocol-detail .consent-content .consent-btn{width:160px;height:42px;display:inline-block;background-color:#5c7ac6;border-radius:2px;border:0;font-size:16px;font-weight:normal;font-stretch:normal;line-height:18px;letter-spacing:0;color:#fff}.protocol-pop .protocol-detail .consent-content .consent-btn:hover{background:#526eb5}.error-message-content{position:fixed;top:0;width:100%;height:40px;line-height:40px;text-align:center;display:none}.error-message-content i{cursor:pointer}.error-message-content.is-chrome{background:#f8f6db}.error-message-content.is-certificate{background:#fbd9d9;color:#ff5656}.error-message-content span{color:#ff5656;display:inline-block;margin-right:20px}.error-message-content i{color:#ff5656;display:inline-block} \ No newline at end of file diff --git a/src/pages/src/components/catalog/operation/SetField.vue b/src/pages/src/components/catalog/operation/SetField.vue index 38e34200f..5cb372ff4 100644 --- a/src/pages/src/components/catalog/operation/SetField.vue +++ b/src/pages/src/components/catalog/operation/SetField.vue @@ -97,8 +97,8 @@
-

蓝鲸用户管理字段

-

对应{{catalogType}}目录字段

+

{{$t('蓝鲸用户管理字段')}}

+

{{$t('对应')}} {{catalogType}} {{$t('目录字段')}}

@@ -138,7 +138,7 @@

{{$t('蓝鲸用户管理字段')}}

-

{{$t('对应')}}{{catalogType}}{{$t('目录字段')}}

+

{{$t('对应')}} {{catalogType}} {{$t('目录字段')}}