Commit a0dd459c authored by Calum Mackervoy's avatar Calum Mackervoy

Merge branch 'css-registration' into 'master'

Css registration

See merge request !39
parents 4a5c9b26 ce4c844a
Pipeline #7175 passed with stage
in 27 seconds
......@@ -3,6 +3,7 @@
--body-background: #3D4057;
--bottom-input: #6157E5;
--button-color: #FFB700;
--link-color: #6259E5;
--text-color: #686B75;
--title-bottom: #E4E8ED;
--title-color: #36383B;
......@@ -46,7 +47,7 @@ body {
box-shadow: 0 0 58px 10px rgba(19, 20, 27, 0.35);
justify-content: center;
margin: auto;
max-width: 600px;
min-width: 600px;
padding: 5.9em;
}
......@@ -95,7 +96,7 @@ input[type="submit"] {
padding: 0.1em 0.9em;
text-transform: uppercase;
transition: 0.2s;
width: 235px;
width: auto;
}
input[type="submit"]:hover {
......@@ -103,3 +104,6 @@ input[type="submit"]:hover {
color: var(--button-color);
}
a {
color: var(--link-color);
}
......@@ -6,6 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="/styles/index.css">
{% load static %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
{% block supplementary_css %}{% endblock %}
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700&amp;amp;subset=latin-ext">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i">
......
......@@ -2,8 +2,7 @@
{% load i18n %}
{% block title %}{% trans "Activation complete" %}{% endblock %}
{% block content %}
{% url 'login' as auth_login_url %}
{% blocktrans %}
Thanks, activation complete! You may now <a href='{{ auth_login_url }}'>login</a> using the username and password you set at registration.
{% endblocktrans %}
{% url 'login' as auth_login_url %}
<h1 class="text-center">{% trans "Thanks, activation complete!" %}</h1>
<p class="text-center">{% trans "You may now <a href='{{ auth_login_url }}'>login</a> using the username and password you set at registration." %}</p>
{% endblock %}
User activation failed. Please contact {{ sitename }} for more information.
{% comment %}
TODO: Add more info from the activation_error dict.
See https://django-registration.readthedocs.io/en/3.0/quickstart.html#django-registration-activation-failed-html
{% endcomment %}
{% extends "django_registration/registration_base.html" %}
{% load i18n %}
{% block title %}{% trans "Activation failed" %}{% endblock %}
{% block content %}
<h1 class="text-center">{% trans "User activation failed." %}</h1>
<p class="text-center">{% trans "Please contact your administrator for more information." %}</p>
{% endblock %}
......@@ -2,5 +2,5 @@
{% load i18n %}
{% block title %}{% trans "Registration closed" %}{% endblock %}
{% block content %}
{% blocktrans %}Registration is closed for this site.{% endblocktrans %}
<h1 class="text-center">{% trans "Registration is closed for this site." %}</h1>
{% endblock %}
......@@ -2,7 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Activation email sent" %}{% endblock %}
{% block content %}
{% blocktrans %}An activation email has been sent.
Please check your email and click on the link to activate your account.{% endblocktrans %}
<h1 class="text-center">{% trans "An activation email has been sent." %}</h1>
<p class="text-center">{% trans "Please check your email and click on the link to activate your account." %}</p>
{% endblock %}
......@@ -3,8 +3,8 @@
{% load static %}
{% block title %}{% trans "Register for an account" %}{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
<link rel="stylesheet" href="{% static 'django_registration/registration_form.css' %}"/>
{% endblock %}
......
......@@ -7,7 +7,6 @@
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
<link rel="stylesheet" href="{% static 'oidc_provider/authorize.css' %}"/>
{% endblock %}
......
......@@ -7,7 +7,6 @@
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
<link rel="stylesheet" href="{% static 'registration/login.css' %}"/>
{% endblock %}
......
......@@ -7,7 +7,6 @@
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
<link rel="stylesheet" href="{% static 'registration/login.css' %}"/>
{% endblock %}
......
{% extends "base.html" %}
{% load i18n %}
{% load static %}
{% block title %}
{% trans "Email Sent" %}
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
{% endblock %}
{% block title %}{% trans "Email Sent" %}{% endblock %}
{% block content %}
<h1 class="text-center">{% trans "Check your inbox." %}</h1>
<p class="text-center">{% trans "We've emailed you instructions for setting your password. You should receive the email shortly!" %}</p>
<h1 class="text-center">{% trans "Check your inbox." %}</h1>
<p class="text-center">{% trans "We've emailed you instructions for setting your password. You should receive the email shortly!" %}</p>
{% endblock %}
......@@ -6,10 +6,6 @@
{% trans "Forgot your password?" %}
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
{% endblock %}
{% block content %}
<div class="flex-column">
<h1 class="text-center">{% trans "Forgot your password?" %}</h1>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment