From 681994c92855bae603eee28856133eda6a7f706b Mon Sep 17 00:00:00 2001 From: JimLynx Date: Fri, 16 Oct 2020 17:24:02 +0100 Subject: [PATCH 1/8] Initial environment setup --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index a38642ff..db198f3d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ __pycache__/ *.sqlite3 # static/ # media/ +setup.bat +Pipfile +Pipfile.lock From ccccf80d3422418987bad61bbbb9bf37ed80e4b9 Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 10:41:55 +0100 Subject: [PATCH 2/8] Add Bootstrap layout and initial content --- static/css/style.css | 136 +++++++++++++++++++++++---------- templates/includes/footer.html | 69 ++++++++++++++++- 2 files changed, 161 insertions(+), 44 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 055b6353..bf23ae57 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,74 +1,126 @@ :root { - /* P = Primary | S = Secondary | T = Tertiary */ - --p-orange: #E84610; - --p-blue: #009FE3; - --p-grey: #4A4A4F; - --p-navy: #445261; - --p-red: #D63649; - --s-grey: #E6ECF0; - --s-yellow: #EFB920; - --s-pink: #FF5A60; - --s-teal: #23BBBB; - --t-grey: #E0E7FF; - --white: #FFFFFF; - --black: #000000; - --bg-grey: #F5F5F5; -} - -html, body { - height: 100%; + /* P = Primary | S = Secondary | T = Tertiary */ + --p-orange: #e84610; + --p-blue: #009fe3; + --p-grey: #4a4a4f; + --p-navy: #445261; + --p-red: #d63649; + --s-grey: #e6ecf0; + --s-yellow: #efb920; + --s-pink: #ff5a60; + --s-teal: #23bbbb; + --t-grey: #e0e7ff; + --white: #ffffff; + --black: #000000; + --bg-grey: #f5f5f5; } +html, body { - display: flex; - flex-direction: column; - font-family: Montserrat, sans-serif; - background-color: var(--bg-grey); - color: var(--p-grey); + height: 100%; +} + +body { + display: flex; + flex-direction: column; + font-family: Montserrat, sans-serif; + background-color: var(--bg-grey); + color: var(--p-grey); } /* NAVBAR */ .navbar { - background-color: var(--white); - box-shadow: 0 2px 9px 0 rgba(0, 0, 0, .2); + background-color: var(--white); + box-shadow: 0 2px 9px 0 rgba(0, 0, 0, 0.2); } .navbar-brand { - background: url("../img/ci-logo.svg") no-repeat center; - height: 40px; - width: 200px; + background: url("../img/ci-logo.svg") no-repeat center; + height: 40px; + width: 200px; } .navbar-nav .nav-item { - margin: 0 1em; + margin: 0 1em; } .navbar-light .navbar-nav .nav-link { - color: var(--p-orange); + color: var(--p-orange); } /* MAIN */ main { - margin-top: 2em; - flex: 1 0 auto; + margin-top: 2em; + flex: 1 0 auto; } /* BUTTONS */ .btn-ci { - background-color: transparent; - color: var(--p-orange); - border: 3px solid var(--p-orange); - transition: all .4s; + background-color: transparent; + color: var(--p-orange); + border: 3px solid var(--p-orange); + transition: all 0.4s; } .btn-ci:hover { - background-color: var(--p-orange); - color: var(--s-grey); + background-color: var(--p-orange); + color: var(--s-grey); } /* FOOTER */ -footer { - flex-shrink: 0; - color: var(--s-grey); - background-color: var(--p-grey); +footer { + flex-shrink: 0; + color: var(--s-grey); + background-color: var(--p-grey); +} + +footer p { + text-align: justify; +} + +footer a:hover { + color: var(--p-orange); + text-decoration: none; +} + +footer ul { + padding: 0; + list-style: none; +} + +footer ul li a { + color: var(--s-grey); +} + +footer h4, +.copyright-wrapper { + margin: 20px 0; +} + +.github-wrapper { + display: flex; + justify-content: center; + margin: 15px 0; +} + +.copyright-wrapper { + margin: 5px 0; + text-align: center; +} + +.copyright-wrapper p { + text-align: center; +} + +.copyright-wrapper a { + color: var(--s-grey); +} + +.fab { + font-size: 200%; + color: var(--s-grey); +} + +@media only screen and (min-width: 768px) { + } diff --git a/templates/includes/footer.html b/templates/includes/footer.html index 1c232824..fada20a7 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -1,2 +1,67 @@ - -

TO DO : templates > includes > footer.html

+
+
+
+

Policies

+ +
+
+

+ Links +

+ +
+
+

+ About Us +

+

+ This Hackathon event was organised by the Code Institute, the leading global provider + of online coding education. Credit-rated by Edinburgh Napier University and validated by the Higher + Education Authority in Sweden, the Ministry of Communications in Singapore, and the Higher Education + Authority in Ireland. +

+
+
+
+ + + + + + + + + + + + +
+
+
+

+ © Copyright 2020 Code Institute +

+
+ +
\ No newline at end of file From fdec08519d5e945c5581873529141d6117abfc19 Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 11:28:48 +0100 Subject: [PATCH 3/8] Finalise footer and tested in HTML & CSS validators --- static/css/style.css | 20 ++++++++++++-------- templates/includes/footer.html | 8 +++++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index bf23ae57..5bda1e2d 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -68,12 +68,18 @@ main { } /* FOOTER */ -footer { +footer { flex-shrink: 0; color: var(--s-grey); background-color: var(--p-grey); } +footer h4{ + margin: 20px 0; + font-weight: 500; + letter-spacing: 1px; +} + footer p { text-align: justify; } @@ -92,11 +98,6 @@ footer ul li a { color: var(--s-grey); } -footer h4, -.copyright-wrapper { - margin: 20px 0; -} - .github-wrapper { display: flex; justify-content: center; @@ -118,9 +119,12 @@ footer h4, .fab { font-size: 200%; + margin: 0 20px; color: var(--s-grey); + transition: transform 0.4s; } -@media only screen and (min-width: 768px) { - +.fab:hover { + transform: scale(1.3); } + diff --git a/templates/includes/footer.html b/templates/includes/footer.html index fada20a7..bc883f13 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -4,7 +4,8 @@

Policies

@@ -36,7 +38,7 @@

About Us

- This Hackathon event was organised by the Code Institute, the leading global provider + Code Institute is the leading global provider of online coding education. Credit-rated by Edinburgh Napier University and validated by the Higher Education Authority in Sweden, the Ministry of Communications in Singapore, and the Higher Education Authority in Ireland. From 8c74d88274db19d63bb6ea6038311d6eb7176bd2 Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 12:08:59 +0100 Subject: [PATCH 4/8] Rearrange links to be consistent with navigation dropdown order --- templates/includes/footer.html | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/templates/includes/footer.html b/templates/includes/footer.html index bc883f13..b1de266d 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -18,19 +18,28 @@

Policies

- Links + Resources

From 98766ca9ce39971fb15524085dc1788f98d6e22a Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 13:15:23 +0100 Subject: [PATCH 5/8] Edit href links --- templates/includes/footer.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/templates/includes/footer.html b/templates/includes/footer.html index b1de266d..1296df1f 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -4,11 +4,12 @@

Policies

  • - - Privacy Policy + + Privacy Policy
  • - Plagiarism Policy + + Plagiarism Policy
    • - FAQ + FAQ
    • - Judging Criteria + Judging Criteria
    • - Useful Resources + Useful Resources
    • Code Institute From ef0c140d4d9b7e99448c348bcfa40388d42b451c Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 14:02:21 +0100 Subject: [PATCH 6/8] Create basic page templates and url paths for footer links --- home/urls.py | 7 ++++++- home/views.py | 30 ++++++++++++++++++++++++++++++ templates/faq.html | 18 ++++++++++++++++++ templates/includes/footer.html | 10 +++++----- templates/judging-criteria.html | 18 ++++++++++++++++++ templates/plagiarism-policy.html | 18 ++++++++++++++++++ templates/privacy-policy.html | 18 ++++++++++++++++++ templates/useful-resources.html | 18 ++++++++++++++++++ 8 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 templates/faq.html create mode 100644 templates/judging-criteria.html create mode 100644 templates/plagiarism-policy.html create mode 100644 templates/privacy-policy.html create mode 100644 templates/useful-resources.html diff --git a/home/urls.py b/home/urls.py index 76f2f662..e09e84c6 100644 --- a/home/urls.py +++ b/home/urls.py @@ -2,5 +2,10 @@ from . import views urlpatterns = [ - path("", views.index, name="home") + path("", views.index, name="home"), + path("faq/", views.faq, name="faq"), + path("judging_criteria/", views.judging_criteria, name="judging_criteria"), + path("plagiarism_policy/", views.plagiarism_policy, name="plagiarism_policy"), + path("privacy_policy/", views.privacy_policy, name="privacy_policy"), + path("useful_resources/", views.useful_resources, name="useful_resources") ] diff --git a/home/views.py b/home/views.py index c26a1391..5b0c37b4 100644 --- a/home/views.py +++ b/home/views.py @@ -5,3 +5,33 @@ def index(request): """ A view to return the index page """ return render(request, "home/index.html") + + +def faq(request): + """ A view to return the FAQ page """ + + return render(request, "faq.html") + + +def judging_criteria(request): + """ A view to return the Judging Criteria page """ + + return render(request, "judging-criteria.html") + + +def plagiarism_policy(request): + """ A view to return the Plagiarism Policy page """ + + return render(request, "plagiarism-policy.html") + + +def privacy_policy(request): + """ A view to return the Privacy Policy page """ + + return render(request, "privacy-policy.html") + + +def useful_resources(request): + """ A view to return the Useful Resources page """ + + return render(request, "useful-resources.html") diff --git a/templates/faq.html b/templates/faq.html new file mode 100644 index 00000000..8657d997 --- /dev/null +++ b/templates/faq.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + + + +

      FAQ

      + +

      Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi + doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat + beatae. +

      +

      + Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque + facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! +

      + +{% endblock %} \ No newline at end of file diff --git a/templates/includes/footer.html b/templates/includes/footer.html index 1296df1f..e7e22cb0 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -5,11 +5,11 @@

      Policies

      • - Privacy Policy + Privacy Policy
      • - Plagiarism Policy + Plagiarism Policy
        • - FAQ + FAQ
        • - Judging Criteria + Judging Criteria
        • - Useful Resources + Useful Resources
        • Code Institute diff --git a/templates/judging-criteria.html b/templates/judging-criteria.html new file mode 100644 index 00000000..97253954 --- /dev/null +++ b/templates/judging-criteria.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + + + +

          Judging Criteria

          + +

          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi + doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat + beatae. +

          +

          + Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque + facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! +

          + +{% endblock %} \ No newline at end of file diff --git a/templates/plagiarism-policy.html b/templates/plagiarism-policy.html new file mode 100644 index 00000000..e4208a7c --- /dev/null +++ b/templates/plagiarism-policy.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + + + +

          Plagiarism Policy

          + +

          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi + doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat + beatae. +

          +

          + Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque + facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! +

          + +{% endblock %} \ No newline at end of file diff --git a/templates/privacy-policy.html b/templates/privacy-policy.html new file mode 100644 index 00000000..175518e8 --- /dev/null +++ b/templates/privacy-policy.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + + + +

          Privacy Policy

          + +

          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi + doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat + beatae. +

          +

          + Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque + facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! +

          + +{% endblock %} \ No newline at end of file diff --git a/templates/useful-resources.html b/templates/useful-resources.html new file mode 100644 index 00000000..34bb73a7 --- /dev/null +++ b/templates/useful-resources.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + + + +

          Useful Resources

          + +

          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi + doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat + beatae. +

          +

          + Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque + facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! +

          + +{% endblock %} \ No newline at end of file From ac78849a4abce407dcf240d707d10dec19348b43 Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 19:51:18 +0100 Subject: [PATCH 7/8] #F01 Fix changes after PR review --- .gitignore | 5 +- home/urls.py | 3 +- static/css/style.css | 126 ++++++++++++++++--------------- templates/faq.html | 16 +--- templates/includes/footer.html | 11 +-- templates/judging-criteria.html | 16 +--- templates/plagiarism-policy.html | 16 +--- templates/privacy-policy.html | 16 +--- templates/useful-resources.html | 16 +--- 9 files changed, 88 insertions(+), 137 deletions(-) diff --git a/.gitignore b/.gitignore index db198f3d..8807392a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ __pycache__/ *.sqlite3 # static/ # media/ +settings.json +.gitpod.yml +.venv/ setup.bat Pipfile -Pipfile.lock +Pipfile.lock \ No newline at end of file diff --git a/home/urls.py b/home/urls.py index e09e84c6..6d936a64 100644 --- a/home/urls.py +++ b/home/urls.py @@ -7,5 +7,6 @@ path("judging_criteria/", views.judging_criteria, name="judging_criteria"), path("plagiarism_policy/", views.plagiarism_policy, name="plagiarism_policy"), path("privacy_policy/", views.privacy_policy, name="privacy_policy"), - path("useful_resources/", views.useful_resources, name="useful_resources") + path("useful_resources/", views.useful_resources, name="useful_resources"), ] + diff --git a/static/css/style.css b/static/css/style.css index 5bda1e2d..84177ccf 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,130 +1,132 @@ :root { - /* P = Primary | S = Secondary | T = Tertiary */ - --p-orange: #e84610; - --p-blue: #009fe3; - --p-grey: #4a4a4f; - --p-navy: #445261; - --p-red: #d63649; - --s-grey: #e6ecf0; - --s-yellow: #efb920; - --s-pink: #ff5a60; - --s-teal: #23bbbb; - --t-grey: #e0e7ff; - --white: #ffffff; - --black: #000000; - --bg-grey: #f5f5f5; + /* P = Primary | S = Secondary | T = Tertiary */ + --p-orange: #E84610; + --p-blue: #009FE3; + --p-grey: #4A4A4F; + --p-navy: #445261; + --p-red: #D63649; + --s-grey: #E6ECF0; + --s-yellow: #EFB920; + --s-pink: #FF5A60; + --s-teal: #23BBBB; + --t-grey: #E0E7FF; + --white: #FFFFFF; + --black: #000000; + --bg-grey: #F5F5F5; } html, body { - height: 100%; + height: 100%; } body { - display: flex; - flex-direction: column; - font-family: Montserrat, sans-serif; - background-color: var(--bg-grey); - color: var(--p-grey); + display: flex; + flex-direction: column; + font-family: Montserrat, sans-serif; + background-color: var(--bg-grey); + color: var(--p-grey); +} + +a:hover { + text-decoration: none; } /* NAVBAR */ .navbar { - background-color: var(--white); - box-shadow: 0 2px 9px 0 rgba(0, 0, 0, 0.2); + background-color: var(--white); + box-shadow: 0 2px 9px 0 rgba(0, 0, 0, .2); } .navbar-brand { - background: url("../img/ci-logo.svg") no-repeat center; - height: 40px; - width: 200px; + background: url("../img/ci-logo.svg") no-repeat center; + height: 40px; + width: 200px; } .navbar-nav .nav-item { - margin: 0 1em; + margin: 0 1em; } .navbar-light .navbar-nav .nav-link { - color: var(--p-orange); + color: var(--p-orange); } /* MAIN */ main { - margin-top: 2em; - flex: 1 0 auto; + margin-top: 2em; + flex: 1 0 auto; } /* BUTTONS */ .btn-ci { - background-color: transparent; - color: var(--p-orange); - border: 3px solid var(--p-orange); - transition: all 0.4s; + background-color: transparent; + color: var(--p-orange); + border: 3px solid var(--p-orange); + transition: all .4s; } .btn-ci:hover { - background-color: var(--p-orange); - color: var(--s-grey); + background-color: var(--p-orange); + color: var(--s-grey); } /* FOOTER */ footer { - flex-shrink: 0; - color: var(--s-grey); - background-color: var(--p-grey); + flex-shrink: 0; + color: var(--s-grey); + background-color: var(--p-grey); } -footer h4{ - margin: 20px 0; - font-weight: 500; - letter-spacing: 1px; +footer h4 { + margin: 20px 0; + font-weight: 500; + letter-spacing: 1px; } footer p { - text-align: justify; + text-align: justify; } footer a:hover { - color: var(--p-orange); - text-decoration: none; + color: var(--p-orange); } footer ul { - padding: 0; - list-style: none; + padding: 0; + list-style: none; } footer ul li a { - color: var(--s-grey); + color: var(--s-grey); } .github-wrapper { - display: flex; - justify-content: center; - margin: 15px 0; + display: flex; + justify-content: center; + margin: 15px 0; } .copyright-wrapper { - margin: 5px 0; - text-align: center; + margin: 5px 0; + text-align: center; } .copyright-wrapper p { - text-align: center; + text-align: center; } .copyright-wrapper a { - color: var(--s-grey); + color: var(--s-grey); } .fab { - font-size: 200%; - margin: 0 20px; - color: var(--s-grey); - transition: transform 0.4s; + font-size: 200%; + margin: 0 20px; + color: var(--s-grey); + transition: transform .4s; } .fab:hover { - transform: scale(1.3); -} - + transform: scale(1.3); +} \ No newline at end of file diff --git a/templates/faq.html b/templates/faq.html index 8657d997..a0d46db2 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -1,18 +1,8 @@ -{% extends 'base.html' %} +{% extends "base.html" %} {% load static %} {% block content %} - -

          FAQ

          + -

          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi - doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat - beatae. -

          -

          - Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque - facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! -

          - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/includes/footer.html b/templates/includes/footer.html index e7e22cb0..ac3d0df2 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -13,7 +13,7 @@

          Policies

        • Github Terms of Service + target="_blank">GitHub Terms of Service
@@ -23,15 +23,12 @@

@@ -72,8 +68,7 @@

- © Copyright 2020 Code Institute + © 2020 Code Institute

- - \ No newline at end of file + diff --git a/templates/judging-criteria.html b/templates/judging-criteria.html index 97253954..6f52d7af 100644 --- a/templates/judging-criteria.html +++ b/templates/judging-criteria.html @@ -1,18 +1,8 @@ -{% extends 'base.html' %} +{% extends "base.html" %} {% load static %} {% block content %} - -

Judging Criteria

+ -

Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi - doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat - beatae. -

-

- Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque - facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! -

- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/plagiarism-policy.html b/templates/plagiarism-policy.html index e4208a7c..68e9341c 100644 --- a/templates/plagiarism-policy.html +++ b/templates/plagiarism-policy.html @@ -1,18 +1,8 @@ -{% extends 'base.html' %} +{% extends "base.html" %} {% load static %} {% block content %} - -

Plagiarism Policy

+ -

Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi - doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat - beatae. -

-

- Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque - facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! -

- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/privacy-policy.html b/templates/privacy-policy.html index 175518e8..4294a88c 100644 --- a/templates/privacy-policy.html +++ b/templates/privacy-policy.html @@ -1,18 +1,8 @@ -{% extends 'base.html' %} +{% extends "base.html" %} {% load static %} {% block content %} - -

Privacy Policy

+ -

Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi - doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat - beatae. -

-

- Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque - facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! -

- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/useful-resources.html b/templates/useful-resources.html index 34bb73a7..b3e13ce4 100644 --- a/templates/useful-resources.html +++ b/templates/useful-resources.html @@ -1,18 +1,8 @@ -{% extends 'base.html' %} +{% extends "base.html" %} {% load static %} {% block content %} - -

Useful Resources

+ -

Lorem ipsum dolor sit amet consectetur, adipisicing elit. Beatae, error cumque. Esse, obcaecati necessitatibus quasi - doloremque soluta cum voluptatum veritatis eius voluptas molestias a, magnam quam corporis. Voluptas, placeat - beatae. -

-

- Lorem ipsum dolor, sit amet consectetur adipisicing elit. Magnam fugiat fugit hic debitis eligendi unde eaque - facilis dignissimos commodi eos, odit nesciunt. Rerum quos suscipit quibusdam dolorum impedit temporibus sunt! -

- -{% endblock %} \ No newline at end of file +{% endblock %} From de1f84140dea48081014aa2ecee76910058b3096 Mon Sep 17 00:00:00 2001 From: JimLynx Date: Sat, 17 Oct 2020 19:55:24 +0100 Subject: [PATCH 8/8] #F01 Remove target_blank on internal links --- templates/includes/footer.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/includes/footer.html b/templates/includes/footer.html index ac3d0df2..f7413442 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -23,16 +23,16 @@