diff --git a/musician/static/musician/css/default.css b/musician/static/musician/css/default.css index 8d85c31..f18a80f 100644 --- a/musician/static/musician/css/default.css +++ b/musician/static/musician/css/default.css @@ -42,3 +42,60 @@ a:hover { color: #fff; background: #6d7fcc; }*/ + +.vertical-center { + min-height: 100%; /* Fallback for browsers do NOT support vh unit */ + min-height: 100vh; /* These two lines are counted as one :-) */ + + display: flex; + align-items: center; + } + +/** bootstrap override **/ +.btn-primary { + color: #fff; + background-color: #8DB823; + border-color: #8DB823; +} + +.btn-primary:hover, +.btn-primary:not(:disabled):not(.disabled).active, +.btn-primary:not(:disabled):not(.disabled):active, +.show>.btn-primary.dropdown-toggle { + color: #fff; + background-color: #acc862; + border-color: #ccde98; +} + +.btn-primary.focus, .btn-primary:focus { + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5); +} + +/** login **/ +#body-login .jumbotron { + background: #282532;/**#50466E;**/ +} + +#login-content { + background:white; + padding: 2rem; +} + +#login-content input[type="text"].form-control, +#login-content input[type="password"].form-control { + border-radius: 0; + border: 0; + border-bottom: 2px solid #8E8E8E; +} + +#login-content .form-actions-no-box { + margin-top: 6rem; +} + +#login-footer { + margin-top: 1.5rem; + text-align: center; +} +#login-footer a { + color: #FEFBF2; +} diff --git a/musician/static/musician/images/logo-pangea-monocrome-h.png b/musician/static/musician/images/logo-pangea-monocrome-h.png new file mode 100644 index 0000000..25e4ed6 Binary files /dev/null and b/musician/static/musician/images/logo-pangea-monocrome-h.png differ diff --git a/musician/templates/auth/login.html b/musician/templates/auth/login.html index 15d5e93..bd08781 100644 --- a/musician/templates/auth/login.html +++ b/musician/templates/auth/login.html @@ -1,50 +1,72 @@ -{% extends "auth/login_base.html" %} -{% load i18n %} +{% extends "musician/base.html" %} +{% load i18n static %} -{% block login_content %} -
-
- {% csrf_token %} - +{% block body %} -
-
- - - {% if form.username.errors %} -

- {{ form.username.errors|striptags }} -

- {% endif %} + +
+
+
+
+ {% block branding %} +

+ Pangea.org - Internet etic i solidari +

+ {% endblock %} +
+
+ + {% csrf_token %} + + +
+
+ + {% if form.username.errors %} +

+ {{ form.username.errors|striptags }} +

+ {% endif %} +
+
+ +
+
+ + {% if form.password.errors %} +

+ {{ form.password.errors|striptags }} +

+ {% endif %} +
+
+ + {% if form.non_field_errors %} + {% for error in form.non_field_errors %} +
{{ error }}
+ {% endfor %} + {% endif %} + +
+ +
+ +
-
- -
-
- - - {% if form.password.errors %} -

- {{ form.password.errors|striptags }} -

- {% endif %} + + -
- - {% if form.non_field_errors %} - {% for error in form.non_field_errors %} -
{{ error }}
- {% endfor %} - {% endif %} - - -
- -
- -
-{% endblock login_content %} +
+
+ +{% endblock %} diff --git a/musician/templates/auth/login_base.html b/musician/templates/auth/login_base.html deleted file mode 100644 index 3030be1..0000000 --- a/musician/templates/auth/login_base.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "musician/base.html" %} - -{% block body %} - -
-
-
-
-
- {% block branding %}

Musician v{{ version }}

{% endblock %} -
-
- -
- {% block login_content %} - {% endblock login_content %} -
-
-
-
- -{% endblock %}