From f401c66f979bbaaa07728ef1267f682ff8543aca Mon Sep 17 00:00:00 2001 From: Guillaume Bertholon Date: Fri, 18 Dec 2020 21:20:59 +0100 Subject: [PATCH] Simplify html structure to remove useless div --- .../templates/registration/login.html | 3 --- mainsite/scss/params.scss | 4 ++-- mainsite/scss/style.scss | 22 +++++++++---------- mainsite/static/css/style.css | 20 ++++++++--------- mainsite/templates/base.html | 9 +++----- mainsite/templates/small_page.html | 2 +- 6 files changed, 27 insertions(+), 33 deletions(-) diff --git a/gestiojeux_auth/templates/registration/login.html b/gestiojeux_auth/templates/registration/login.html index baa49f9..3028df1 100644 --- a/gestiojeux_auth/templates/registration/login.html +++ b/gestiojeux_auth/templates/registration/login.html @@ -1,8 +1,5 @@ {% extends "small_page.html" %} -{% block "title" %} -{% endblock %} - {% block "content" %}

Connexion par mot de passe

diff --git a/mainsite/scss/params.scss b/mainsite/scss/params.scss index 9c9bb01..7739ca3 100644 --- a/mainsite/scss/params.scss +++ b/mainsite/scss/params.scss @@ -1,8 +1,8 @@ $page_bg_color: #f6fbfd; $page_text_color: #250f2d; $page_link_color: #1e464c; -$page_width: 800px; -$small_page_width: 500px; +$page_width: 850px; +$small_page_width: 550px; $help_text_color: rgba($page_text_color, .65); diff --git a/mainsite/scss/style.scss b/mainsite/scss/style.scss index 996a708..88d265e 100644 --- a/mainsite/scss/style.scss +++ b/mainsite/scss/style.scss @@ -31,20 +31,20 @@ body { } main { - display: flex; - justify-content: center; - - flex: 1 0 auto; -} - -#main_content { - width: $page_width; - padding: 20px; - margin-bottom: 50px; + max-width: $page_width; + width: 100%; + padding: 20px 40px; + margin: 0 auto 50px; text-align: justify; + flex: 1 0 auto; + + @media (max-width: 700px) { + padding: 15px 30px; + } + &.small_page { - width: $small_page_width; + max-width: $small_page_width; } } diff --git a/mainsite/static/css/style.css b/mainsite/static/css/style.css index 0071de4..cc2606c 100644 --- a/mainsite/static/css/style.css +++ b/mainsite/static/css/style.css @@ -203,17 +203,17 @@ body { font-size: 12pt; } } main { - display: flex; - justify-content: center; + max-width: 850px; + width: 100%; + padding: 20px 40px; + margin: 0 auto 50px; + text-align: justify; flex: 1 0 auto; } - -#main_content { - width: 800px; - padding: 20px; - margin-bottom: 50px; - text-align: justify; } - #main_content.small_page { - width: 500px; } + @media (max-width: 700px) { + main { + padding: 15px 30px; } } + main.small_page { + max-width: 550px; } footer { background-color: #6bb8c4; diff --git a/mainsite/templates/base.html b/mainsite/templates/base.html index 70570d6..bf7fb07 100644 --- a/mainsite/templates/base.html +++ b/mainsite/templates/base.html @@ -9,13 +9,10 @@ {% include "partials/header.html" %} -
-
- {% include "partials/messages.html" %} +
+ {% include "partials/messages.html" %} - {% block "content" %} - {% endblock %} -
+ {% block "content" %}{% endblock %}
{% include "partials/footer.html" %} diff --git a/mainsite/templates/small_page.html b/mainsite/templates/small_page.html index 2adaa40..1a371d4 100644 --- a/mainsite/templates/small_page.html +++ b/mainsite/templates/small_page.html @@ -1,3 +1,3 @@ {% extends "base.html" %} -{% block "main_content_class" %}small_page{% endblock %} +{% block "main_attributes" %}class="small_page"{% endblock %}