mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-07 00:28:25 -04:00
Make spacing and position of banners consistent
Banners should always be the first thing on the page. Because headers already have padding we don’t want to put padding on the container. So banners should also have top padding to distance then from the red bar. They should also sit in the 3/4 column if the page has side navigation. This commit adds a new template (`withoutnav_template.html`) which extends `admin_template.html`. All views then extend one or the other, never the `admin_template.html` directly. This means that `admin_template.html` doesn’t have to make decisions about where the flash messages are displayed.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify | Set up service
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/browse-list.html" import browse_list %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Dashboard
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<h1 class="heading-xlarge">
|
||||
Choose service
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify |
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Create a user account
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify | Create an account
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Get started
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
Sign in
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% from "components/banner.html" import banner %}
|
||||
{% from "components/big-number.html" import big_number %}
|
||||
@@ -13,7 +13,7 @@
|
||||
Styleguide – GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<h1 class="heading-xlarge">
|
||||
Styleguide
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<!-- this page is just a hack for building out pages - same functionality as text-not-received, but for the register from an invite flow -->
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify | Text verification
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/table.html" import list_table, row, field %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Your profile
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<h1 class="heading-xlarge">Your profile</h1>
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Confirm mobile number
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
GOV.UK Notify | Confirm email address and mobile number
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-two-thirds">
|
||||
|
||||
Reference in New Issue
Block a user