From 79e0881a232933be4e0a991c9c6278f12a6d8518 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 28 Sep 2016 15:05:54 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20inherit=20directly=20from=20adm?=
 =?UTF-8?q?in=20template?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pages that don’t have navigation shouldn’t extend the top-level admin
template directly.

They should extend `withoutnav_template.html` instead, because then they
get a wrapping `<main>` element, which is good semantically and for
accessibility, and also defaults the font size to `19px`.
---
 app/templates/views/user-profile/authenticate.html    | 4 ++--
 app/templates/views/user-profile/change-password.html | 4 ++--
 app/templates/views/user-profile/change.html          | 4 ++--
 app/templates/views/user-profile/confirm.html         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html
index 645dfb956..6abcccbff 100644
--- a/app/templates/views/user-profile/authenticate.html
+++ b/app/templates/views/user-profile/authenticate.html
@@ -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 | Service settings
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block maincolumn_content %}
 
   <h1 class="heading-large">Change your {{ thing }}</h1>
 
diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html
index 52058e0c2..477458139 100644
--- a/app/templates/views/user-profile/change-password.html
+++ b/app/templates/views/user-profile/change-password.html
@@ -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 | Service settings
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block maincolumn_content %}
 
   <h1 class="heading-large">Change your password</h1>
 
diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html
index f0e55c288..9554dd5a7 100644
--- a/app/templates/views/user-profile/change.html
+++ b/app/templates/views/user-profile/change.html
@@ -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 | Service settings
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block maincolumn_content %}
 
   <h1 class="heading-large">Change your {{ thing }}</h1>
 
diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html
index 0a4d8db32..c0a488169 100644
--- a/app/templates/views/user-profile/confirm.html
+++ b/app/templates/views/user-profile/confirm.html
@@ -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 | Service settings
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block maincolumn_content %}
 
   <h1 class="heading-large">Change your {{ thing }}</h1>