From 67b8965e1f95dec599582e877cbe768712ce69eb Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 10 Jun 2022 15:44:43 +0100 Subject: [PATCH] Remove boilerplate --- static/src/scss/index.scss | 187 ------------------ templates/base.html | 12 +- website/home/templates/home/home_page.html | 5 +- website/home/templates/home/welcome_page.html | 52 ----- 4 files changed, 4 insertions(+), 252 deletions(-) delete mode 100644 website/home/templates/home/welcome_page.html diff --git a/static/src/scss/index.scss b/static/src/scss/index.scss index 2379395..e69de29 100644 --- a/static/src/scss/index.scss +++ b/static/src/scss/index.scss @@ -1,187 +0,0 @@ -html { - box-sizing: border-box; -} - -*, -*:before, -*:after { - box-sizing: inherit; -} - -body { - max-width: 960px; - min-height: 100vh; - margin: 0 auto; - padding: 0 15px; - color: #231f20; - font-family: 'Helvetica Neue', 'Segoe UI', Arial, sans-serif; - line-height: 1.25; -} - -a { - background-color: transparent; - color: #308282; - text-decoration: underline; -} - -a:hover { - color: #ea1b10; -} - -h1, -h2, -h3, -h4, -h5, -p, -ul { - padding: 0; - margin: 0; - font-weight: 400; -} - -svg:not(:root) { - overflow: hidden; -} - -.header { - display: flex; - justify-content: space-between; - align-items: center; - padding-top: 20px; - padding-bottom: 10px; - border-bottom: 1px solid #e6e6e6; -} - -.logo { - width: 150px; - margin-inline-end: 20px; -} - -.logo a { - display: block; -} - -.figure-logo { - max-width: 150px; - max-height: 55.1px; -} - -.release-notes { - font-size: 14px; -} - -.main { - padding: 40px 0; - margin: 0 auto; - text-align: center; -} - -.figure-space { - max-width: 265px; -} - -@keyframes pos { - 0%, 100% { - transform: rotate(-6deg); - } - 50% { - transform: rotate(6deg); - } -} - -.egg { - fill: #43b1b0; - animation: pos 3s ease infinite; - transform: translateY(50px); - transform-origin: 50% 80%; -} - -.main-text { - max-width: 400px; - margin: 5px auto; -} - -.main-text h1 { - font-size: 22px; -} - -.main-text p { - margin: 15px auto 0; -} - -.footer { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - border-top: 1px solid #e6e6e6; - padding: 10px; -} - -.option { - display: block; - padding: 10px 10px 10px 34px; - position: relative; - text-decoration: none; -} - -.option svg { - width: 24px; - height: 24px; - fill: gray; - border: 1px solid #d9d9d9; - padding: 5px; - border-radius: 100%; - top: 10px; - /* Remove once we drop support for Safari 13. */ - /* stylelint-disable-next-line property-disallowed-list */ - left: 0; - inset-inline-start: 0; - position: absolute; -} - -.option h2 { - font-size: 19px; - text-decoration: underline; -} - -.option p { - padding-top: 3px; - color: #231f20; - font-size: 15px; - font-weight: 300; -} - -@media (max-width: 996px) { - body { - max-width: 780px; - } -} - -@media (max-width: 767px) { - .option { - flex: 0 0 50%; - } -} - -@media (max-width: 599px) { - .main { - padding: 20px 0; - } - - .figure-space { - max-width: 200px; - } - - .footer { - display: block; - width: 300px; - margin: 0 auto; - } -} - -@media (max-width: 360px) { - .header-link { - max-width: 100px; - } -} diff --git a/templates/base.html b/templates/base.html index fede8c7..dd7e913 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,18 +10,15 @@ {% endblock %} {% block title_suffix %} {% wagtail_site as current_site %} - {% if current_site and current_site.site_name %}- {{ current_site.site_name }}{% endif %} + {% if current_site and current_site.site_name %}:: {{ current_site.site_name }}{% endif %} {% endblock %} - {# Global stylesheets #} - {% block extra_css %} - {# Override this in templates to add extra stylesheets #} - {% endblock %} + {% block extra_css %}{% endblock %} @@ -29,11 +26,8 @@ {% block content %}{% endblock %} - {# Global javascript #} - {% block extra_js %} - {# Override this in templates to add extra javascript #} - {% endblock %} + {% block extra_js %}{% endblock %} diff --git a/website/home/templates/home/home_page.html b/website/home/templates/home/home_page.html index 7564461..e11350e 100644 --- a/website/home/templates/home/home_page.html +++ b/website/home/templates/home/home_page.html @@ -5,9 +5,6 @@ {% block content %} -{% comment %} -Delete the line below if you're just getting started and want to remove the welcome screen! -{% endcomment %} -{% include 'home/welcome_page.html' %} +Content {% endblock content %} diff --git a/website/home/templates/home/welcome_page.html b/website/home/templates/home/welcome_page.html deleted file mode 100644 index dcacaf3..0000000 --- a/website/home/templates/home/welcome_page.html +++ /dev/null @@ -1,52 +0,0 @@ -{% load i18n wagtailcore_tags %} - -
- -
- {% comment %} - This works for all cases but prerelease versions: - {% endcomment %} - - {% trans "View the release notes" %} - -
-
-
-
- -
-
-

{% trans "Welcome to your new Wagtail site!" %}

-

{% trans 'Please feel free to join our community on Slack, or get started with one of the links below.' %}

-
-
-