Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 登录页图片更换 #144 #185

Merged
merged 1 commit into from
Dec 6, 2021
Merged

fix: 登录页图片更换 #144 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/login/bklogin/templates/account/login_ce.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
<div class="login-from">
<div class="logo-title">
<div class="logo_ce">
<img src="{{STATIC_URL}}{% trans 'img/logo_ce/logo_ce.png' %}" alt="">
<img src="{{STATIC_URL}}{% trans 'img/logo_ce/logo.svg' %}" alt="">
</div>
<div>
<span class="title">{% trans '社区版' %}</span>
<img src="{{STATIC_URL}}/img/logo_ce/v7.png" alt="">
<img src="{{STATIC_URL}}/img/logo_ce/v7.svg" alt="">
</div>
</div>
<div class="from-detail">
Expand Down Expand Up @@ -80,29 +80,29 @@
<a href="{{ forget_password_url }}" class="password-btn fr" target="_blank">{% trans '忘记密码？' %}</a>
</div>
</form>
<div class="language-switcher">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
<form id="language-form" action="{{SITE_URL}}i18n/setlang/" method="post">{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select name="language" style="display: none;">
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }}
</option>
{% endfor %}
</select>
<div class="language-select" style="display: flex">
<p class="language-item {% if LANGUAGE_CODE == 'zh-hans' %} active {% endif %}" >
<span id="ch" class="text-active">中文</span>
</p>
<p class="language-item {% if LANGUAGE_CODE == 'en' %} active {% endif %}">
<span id="en" class="text-active">English</span>
</p>
<div class="language-switcher">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
<form id="language-form" action="{{SITE_URL}}i18n/setlang/" method="post">{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select name="language" style="display: none;">
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }}
</option>
{% endfor %}
</select>
<div class="language-select" style="display: flex">
<p class="language-item {% if LANGUAGE_CODE == 'zh-hans' %} active {% endif %}" >
<span id="ch" class="text-active">中文</span>
</p>
<p class="language-item {% if LANGUAGE_CODE == 'en' %} active {% endif %}">
<span id="en" class="text-active">English</span>
</p>
</div>
</form>
</div>
</form>
</div>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/login/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,12 @@ msgid "登录|蓝鲸智云"
msgstr "Login|BlueKing"

#: bklogin/templates/account/login_ce.html:42
msgid "img/logo_ce/logo_ce.png"
msgstr "img/logo_ce/logo_ce.png"
msgid "img/logo_ce/logo.svg"
msgstr "img/logo_ce/logo_en.svg"

#: bklogin/templates/account/login_ce.html:45
msgid "社区版"
msgstr "社区版"
msgstr "CE"

#: bklogin/templates/account/login_ce.html:64
#, fuzzy
Expand Down
Binary file modified src/login/static/assets/blueking-icon/fonts/iconcool.eot
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions src/login/static/assets/blueking-icon/fonts/iconcool.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/login/static/assets/blueking-icon/fonts/iconcool.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified src/login/static/assets/blueking-icon/fonts/iconcool.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/login/static/assets/blueking-icon/iconcool.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/login/static/assets/blueking-icon/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,12 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
.icon-invisible-eye:before {
content: "\e104";
}
.icon-v7:before {
content: "\e105";
}
.icon-logo:before {
content: "\e106";
}
.icon-lanjingzhiyunen:before {
content: "\e107";
}
10 changes: 10 additions & 0 deletions src/login/static/assets/blueking-icon/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading