diff --git a/.gitignore b/.gitignore index ecbb47960..491009b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ logs/* release/* releashe /apps/script.py +data/certs diff --git a/apps/authentication/templates/authentication/login.html b/apps/authentication/templates/authentication/login.html index 823f22201..3c95332a2 100644 --- a/apps/authentication/templates/authentication/login.html +++ b/apps/authentication/templates/authentication/login.html @@ -32,12 +32,29 @@ font-weight: normal; } - .hr-line-dashed { - border-top: 1px dashed #e7eaec; - color: #ffffff; - background-color: #ffffff; - height: 1px; - margin: 20px 0; + .form-group { + margin-bottom: 40px; + margin-top: 10px; + } + + .addition .form-group, .has-error .form-group { + margin-bottom: 20px; + margin-top: 10px; + } + + .auth-methods.has-error .form-group, .auth-methods.addition .form-group { + margin-bottom: 15px; + margin-top: 5px; + } + + .has-error.addition .form-group { + margin-bottom: 20px; + margin-top: 5px; + } + + .auth-methods.addition.has-error .form-group { + margin-bottom: 10px; + margin-top: 5px; } .login-content { @@ -78,34 +95,25 @@ margin-bottom: 0; } - .captch-field .has-error .help-block { + .captcha-field .has-error .help-block { margin-top: -8px !important; } - .no-captcha-challenge .form-group { - margin-bottom: 20px; - } - .jms-title { - padding: 40px 10px 10px; - } - - .no-captcha-challenge .jms-title { padding: 60px 10px 10px; } - .no-captcha-challenge .welcome-message { - padding-top: 10px; + .more-login-items { + margin-top: 10px; } .more-login-item { border-right: 1px dashed #dedede; - padding-left: 5px; - padding-right: 5px; + padding: 2px 5px; } .more-login-item:last-child { - border: none; + border-right: none; } .select-con { @@ -117,6 +125,7 @@ } .login-page-language { + font-size: 12px!important; margin-right: -11px !important; padding-top: 12px !important; padding-left: 0 !important; @@ -125,15 +134,65 @@ font-weight: 350 !important; min-height: auto !important; } + + .right-image { + height: 100%; + width: 100% + } + + .jms-title { + font-size: 21px; + font-weight:400; + color: #151515; + letter-spacing: 0; + } + .more-methods-title { + position: relative; + margin-top: 20px; + } + .more-methods-title:before, .more-methods-title:after { + position: absolute; + top: 50%; + transform: translateY(-50%); + content: ''; + border: 1px dashed #e7eaec; + width: 35%; + } + .more-methods-title:before { + left: 0; + } + .more-methods-title:after { + right: 0; + } + .more-methods-title.ja:before, .more-methods-title.ja:after{ + width: 26%; + } + .captcha-field .form-group { + margin-bottom: 5px; + } + .auto-login.form-group .checkbox { + margin: 5px 0; + } + + .more-login { + margin-top: 20px; + } + + .has-error .more-login { + margin-top: 0; + } - -
+
@@ -142,26 +201,23 @@
- {{ JMS_TITLE }} + {{ JMS_TITLE }}
-
{% csrf_token %}
@@ -177,7 +233,6 @@
{% bootstrap_field form.username show_label=False %} -
@@ -194,18 +249,18 @@ {% include '_mfa_login_field.html' %}
{% elif form.captcha %} -
+
{% bootstrap_field form.captcha show_label=False %}
{% endif %} -
+