fix: 登录页面优化 TencentBlueKing#144

yuri0528 · Dec 7, 2021 · 8fd30b8 · 8fd30b8
1 parent ad77231
commit 8fd30b8
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 79 deletions.
diff --git a/src/login/bklogin/templates/account/login_ce.html b/src/login/bklogin/templates/account/login_ce.html
@@ -38,19 +38,12 @@
             </div>
             <div class="login-from">
                 <div class="logo-title">
-                    <div class="logo_ce">
-                        <img src="{{STATIC_URL}}{% trans 'img/logo_ce/logo.svg' %}" alt="">
-                    </div>
-                    <div class="logo_community">
-                        <span class="title">{% trans '社区版' %}</span>
-                        <img src="{{STATIC_URL}}/img/logo_ce/v7.svg" alt="">
-                    </div>
+                    <img class="logo-img" src="{{STATIC_URL}}{% trans 'img/logo_ce/logo_ch.png' %}" alt="">
                 </div>
                 <div class="from-detail">
                     <div class="form-login">
                         <form action="{{ app_path }}" method="post" id="login-form" onsubmit="return refresh_token()">{% csrf_token %}
                             <div class="user group-control">
-                                <i class="bk-icon icon-user"></i>
                                 <input id="user" type="text" name="username" placeholder="{% trans '请输入用户名' %}">
                             </div>
                             <div class="pwd group-control">

diff --git a/src/login/locale/en/LC_MESSAGES/django.po b/src/login/locale/en/LC_MESSAGES/django.po
@@ -128,7 +128,7 @@ msgid "您需要登录蓝鲸智云"
 msgstr "You need to log in BlueKing"
 
 #: bklogin/templates/401.html:21 bklogin/templates/account/login.html:51
-#: bklogin/templates/account/login_ce.html:73
+#: bklogin/templates/account/login_ce.html:66
 msgid "立即登录"
 msgstr "Log in"
 
@@ -245,7 +245,7 @@ msgid "蓝鲸官网"
 msgstr "Blueking Official"
 
 #: bklogin/templates/account/base.html:101
-#: bklogin/templates/account/login_ce.html:117
+#: bklogin/templates/account/login_ce.html:110
 msgid "蓝鲸智云 版权所有"
 msgstr "BlueKing Copyright"
 
@@ -268,7 +268,7 @@ msgid "用户名"
 msgstr "username"
 
 #: bklogin/templates/account/login.html:31
-#: bklogin/templates/account/login_ce.html:54
+#: bklogin/templates/account/login_ce.html:47
 msgid "请输入用户名"
 msgstr "Please enter your username"
 
@@ -277,7 +277,7 @@ msgid "密码"
 msgstr "password"
 
 #: bklogin/templates/account/login.html:40
-#: bklogin/templates/account/login_ce.html:58
+#: bklogin/templates/account/login_ce.html:51
 msgid "请输入密码"
 msgstr "Please enter your password"
 
@@ -290,17 +290,17 @@ msgstr "Your password is expired, please"
 msgid "修改密码"
 msgstr "Change Password"
 
-#: bklogin/templates/account/login.html:52
+#: bklogin/templates/account/login.html:67
 msgid "查看用户协议"
 msgstr "Agreement"
 
 #: bklogin/templates/account/login.html:57
-#: bklogin/templates/account/login_ce.html:78
+#: bklogin/templates/account/login_ce.html:71
 msgid "用户协议 >"
 msgstr "Agreement >"
 
 #: bklogin/templates/account/login.html:60
-#: bklogin/templates/account/login_ce.html:80
+#: bklogin/templates/account/login_ce.html:73
 msgid "忘记密码？"
 msgstr "Forget password?"
 
@@ -309,7 +309,7 @@ msgid "img/logo/btn_cn.png"
 msgstr "img/logo/btn_en.png"
 
 #: bklogin/templates/account/login.html:106
-#: bklogin/templates/account/login_ce.html:124
+#: bklogin/templates/account/login_ce.html:117
 msgid ""
 "您的浏览器非Chrome，建议您使用最新版本的Chrome浏览，以保证最好的体验效果"
 msgstr ""
@@ -326,33 +326,29 @@ msgstr ""
 msgid "登录|蓝鲸智云"
 msgstr "Login|BlueKing"
 
-#: bklogin/templates/account/login_ce.html:42
-msgid "img/logo_ce/logo.svg"
-msgstr "img/logo_ce/logo_en.svg"
-
-#: bklogin/templates/account/login_ce.html:45
-msgid "社区版"
-msgstr "CE"
+#: bklogin/templates/account/login_ce.html:41
+msgid "img/logo_ce/logo_ch.png"
+msgstr "img/logo_ce/logo_en.png"
 
-#: bklogin/templates/account/login_ce.html:64
+#: bklogin/templates/account/login_ce.html:57
 #, fuzzy
 #| msgid "修改密码"
 msgid "请修改密码"
 msgstr "Change Password"
 
-#: bklogin/templates/account/login_ce.html:111
+#: bklogin/templates/account/login_ce.html:104
 msgid "QQ群支持"
 msgstr "QQ group"
 
-#: bklogin/templates/account/login_ce.html:112
+#: bklogin/templates/account/login_ce.html:105
 msgid "社区论坛"
 msgstr "Community"
 
-#: bklogin/templates/account/login_ce.html:113
+#: bklogin/templates/account/login_ce.html:106
 msgid "产品官网"
 msgstr "Home"
 
-#: bklogin/templates/account/login_ce.html:114
+#: bklogin/templates/account/login_ce.html:107
 msgid "关注我们"
 msgstr "Follow us"
 

diff --git a/src/login/static/css_ce/login.css b/src/login/static/css_ce/login.css