From 79828ca2274cf6a366bc3819d10558ea8c0c83f2 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 28 Sep 2021 15:35:23 +0200 Subject: [PATCH 1/4] rm bootstrap --- package.json | 1 - self_registration/main/templates/base.html | 1 - 2 files changed, 2 deletions(-) diff --git a/package.json b/package.json index 19dda5d..b4072fa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "private": true, "dependencies": { - "bootstrap": "^4.6.0", "vanillajs-datepicker": "^1.1.4" } } diff --git a/self_registration/main/templates/base.html b/self_registration/main/templates/base.html index ba83809..fa72203 100644 --- a/self_registration/main/templates/base.html +++ b/self_registration/main/templates/base.html @@ -7,7 +7,6 @@ {% block title %}{% translate "Self registration" %}{% endblock %} - -- GitLab From 09e65bd348afc7b3da018aabbc5cb003fd4bdc9c Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 28 Sep 2021 15:35:29 +0200 Subject: [PATCH 2/4] strip down base template --- self_registration/main/templates/base.html | 24 +++++-------------- .../main/selfregisteredsubject_form.html | 1 - 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/self_registration/main/templates/base.html b/self_registration/main/templates/base.html index fa72203..ddfd117 100644 --- a/self_registration/main/templates/base.html +++ b/self_registration/main/templates/base.html @@ -10,26 +10,14 @@ -
- -
-
- {% for message in messages %} - - {% endfor %} - {% block content %}{% endblock %} -
+ {% for message in messages %} + + {% endfor %} + {% block content %}{% endblock %} - {% block extra_scripts %}{% endblock %} diff --git a/self_registration/main/templates/main/selfregisteredsubject_form.html b/self_registration/main/templates/main/selfregisteredsubject_form.html index 03749fa..66f15a6 100644 --- a/self_registration/main/templates/main/selfregisteredsubject_form.html +++ b/self_registration/main/templates/main/selfregisteredsubject_form.html @@ -2,7 +2,6 @@ {% load static i18n bootstrap4 %} {% block content %} -

{% translate 'Register yourself for studies' %}

{% csrf_token %} {% bootstrap_form_errors form type='non_fields' %} -- GitLab From 24150dd5feeeafd47ab717bfbf7e33a04cb3641d Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 28 Sep 2021 15:54:35 +0200 Subject: [PATCH 3/4] add minimal style --- self_registration/main/static/style.css | 50 ++++++++++++++++++++++ self_registration/main/templates/base.html | 1 + 2 files changed, 51 insertions(+) create mode 100644 self_registration/main/static/style.css diff --git a/self_registration/main/static/style.css b/self_registration/main/static/style.css new file mode 100644 index 0000000..8797956 --- /dev/null +++ b/self_registration/main/static/style.css @@ -0,0 +1,50 @@ +:root { + color: #000; + font-family: sans-serif; + line-height: 1.4; +} + +a { + color: #006c66; +} + +html, +body { + margin: 0; + padding: 0; +} + +.form-group { + margin-bottom: 1.8em; +} +.form-group label { + display: block; + margin-bottom: 0.1em; +} + +button { + padding: 0.5em 1.2em; + cursor: pointer; +} + +select, +textarea, +input { + font-size: inherit; + padding: 0.2em; +} + +.invalid-feedback { + color: #842029; +} + +.alert { + border: 1px solid; + padding: 1em; + margin-bottom: 1.8em; + border-radius: 0.5em; +} +.alert-danger { + color: #842029; + background-color: #f8d7da; +} diff --git a/self_registration/main/templates/base.html b/self_registration/main/templates/base.html index ddfd117..f212ccf 100644 --- a/self_registration/main/templates/base.html +++ b/self_registration/main/templates/base.html @@ -7,6 +7,7 @@ {% block title %}{% translate "Self registration" %}{% endblock %} + -- GitLab From 5eda933b8134f458f4d8b22be922f87840738682 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 28 Sep 2021 16:13:30 +0200 Subject: [PATCH 4/4] center standalone pages --- self_registration/main/static/style.css | 6 ++++++ .../templates/main/selfregisteredsubject_confirmed.html | 4 +++- .../main/templates/main/selfregisteredsubject_delete.html | 2 +- .../main/templates/main/selfregisteredsubject_deleted.html | 4 +++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/self_registration/main/static/style.css b/self_registration/main/static/style.css index 8797956..516d2b8 100644 --- a/self_registration/main/static/style.css +++ b/self_registration/main/static/style.css @@ -48,3 +48,9 @@ input { color: #842029; background-color: #f8d7da; } + +.center { + max-width: 30em; + margin: 2em auto; + padding: 1em; +} diff --git a/self_registration/main/templates/main/selfregisteredsubject_confirmed.html b/self_registration/main/templates/main/selfregisteredsubject_confirmed.html index abe9e36..9f658fa 100644 --- a/self_registration/main/templates/main/selfregisteredsubject_confirmed.html +++ b/self_registration/main/templates/main/selfregisteredsubject_confirmed.html @@ -2,5 +2,7 @@ {% load i18n %} {% block content %} -

{% translate 'Your email address has been confirmed. The data you have entered will be added to the subject database. The next time we have a matching study you will be contacted. You can close this window. The link from the email is now invalid.' %}

+
+

{% translate 'Your email address has been confirmed. The data you have entered will be added to the subject database. The next time we have a matching study you will be contacted. You can close this window. The link from the email is now invalid.' %}

+
{% endblock %} diff --git a/self_registration/main/templates/main/selfregisteredsubject_delete.html b/self_registration/main/templates/main/selfregisteredsubject_delete.html index 6f96236..7c04a36 100644 --- a/self_registration/main/templates/main/selfregisteredsubject_delete.html +++ b/self_registration/main/templates/main/selfregisteredsubject_delete.html @@ -2,7 +2,7 @@ {% load i18n %} {% block content %} - + {% csrf_token %}

{% translate 'Are you sure you wish to delete your data from the subject registration repository?' %}

diff --git a/self_registration/main/templates/main/selfregisteredsubject_deleted.html b/self_registration/main/templates/main/selfregisteredsubject_deleted.html index 4183570..a3b46cd 100644 --- a/self_registration/main/templates/main/selfregisteredsubject_deleted.html +++ b/self_registration/main/templates/main/selfregisteredsubject_deleted.html @@ -2,5 +2,7 @@ {% load i18n %} {% block content %} -

{% translate 'Your data has been deleted successfully.' %}

+
+

{% translate 'Your data has been deleted successfully.' %}

+
{% endblock %} -- GitLab