darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 02:23:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace the .column-... classes in _grids.scss

Browse Source 
We had 7 classes in _grids.scss named `.column-...` which were being
used to give a certain column width. These worked by using `@include
grid column()`, which is now deprecated.

`.column-whole` and `.column-three-quarters` can be removed and replaced
with `govuk-grid-column-full` and `govuk-grid-column-three-quarters`
respectively. The other column classes don't have a direct replacment in
GOV.UK Frontend. To get round this, we overwrite the `$govuk-grid-width`
SASS map in `extensions.scss` to add in extra widths, then use this with
the `govuk-grid-column` mixin to create new classes in for our custom
widths in `_grids.scss`
This commit is contained in:
Katie Smith
2020-03-06 11:11:41 +00:00
parent e2952e6a7a
commit a85f7fa2c1
77 changed files with 117 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/_grids.scss
+11 -18
View File
@@ -1,29 +1,22 @@
.column-whole {
@include grid-column(1/1);
.govuk-grid-column-one-sixth {
@include govuk-grid-column(one-sixth, $class: false);
}
.column-three-quarters {
@include grid-column(3/4);
.govuk-grid-column-five-sixths {
@include govuk-grid-column(five-sixths, $class: false);
}
.column-one-sixth {
@include grid-column(1/6);
.govuk-grid-column-one-eighth {
@include govuk-grid-column(one-eighth, $class: false);
}
.column-five-sixths {
@include grid-column(5/6);
.govuk-grid-column-five-eighths {
@include govuk-grid-column(five-eighths, $class: false);
}
.column-one-eighth {
@include grid-column(1/8);
}
.column-five-eighths {
@include grid-column(5/8);
}
.column-seven-eighths {
@include grid-column(7/8);
.govuk-grid-column-seven-eighths {
@include govuk-grid-column(seven-eighths, $class: false);
}
%top-gutter,
app/assets/stylesheets/govuk-frontend/extensions.scss
+13
View File
@@ -35,3 +35,16 @@
.govuk-link--destructive {
@include govuk-link-style-destructive-no-visited-state;
}
$govuk-grid-widths: (
one-eighth: 12.5%,
one-sixth: 16.6666%,
one-quarter: 25%,
one-third: 33.3333%,
one-half: 50%,
five-eighths: 62.5%,
two-thirds: 66.6666%,
three-quarters: 75%,
five-sixths: 83.3333%,
seven-eighths: 87.5%,
full: 100%
);
app/templates/content_template.html
+1 -1
View File
@@ -14,7 +14,7 @@
<div class="govuk-grid-column-one-quarter">
{{ sub_navigation(navigation_links) }}
</div>
<div class="column-five-eighths">
<div class="govuk-grid-column-five-eighths">
{% else %}
<div class="govuk-grid-column-two-thirds">
{% endif %}
app/templates/org_template.html
+1 -1
View File
@@ -19,7 +19,7 @@
<div class="govuk-grid-column-one-quarter">
{% include "org_nav.html" %}
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% block beforeContent %}{% endblock %}
<main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
{% block content %}
app/templates/partials/tour.html
+6 -6
View File
@@ -3,30 +3,30 @@
{% call banner_wrapper(type='tour') %}
<p class="heading-medium">Try sending yourself this example</p>
<div class="govuk-grid-row bottom-gutter {% if help != '1' %}greyed-out-step{% endif %}">
<div class="column-one-sixth">
<div class="govuk-grid-column-one-sixth">
<p class="heading-large" style="float: left;">1.</p>
</div>
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
Every message is sent from a template
</p>
</div>
</div>
<div class="govuk-grid-row bottom-gutter {% if help != '2' %}greyed-out-step{% endif %}">
<div class="column-one-sixth">
<div class="govuk-grid-column-one-sixth">
<p class="heading-large">2.</p>
</div>
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
The template pulls in the data you provide
</p>
</div>
</div>
<div class="govuk-grid-row bottom-gutter {% if help != '3' %}greyed-out-step{% endif %}">
<div class="column-one-sixth">
<div class="govuk-grid-column-one-sixth">
<p class="heading-large">3.</p>
</div>
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
Notify delivers the message
</p>
app/templates/views/agreement/agreement-accept.html
+1 -1
View File
@@ -13,7 +13,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Accept our data sharing and financial agreement',
app/templates/views/agreement/agreement-confirm.html
+1 -1
View File
@@ -10,7 +10,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Confirm that you accept the agreement',
app/templates/views/agreement/service-agreement-choose.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Accept the data sharing and financial agreement',
app/templates/views/agreement/service-agreement-signed.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Your organisation has already accepted the agreement',
app/templates/views/agreement/service-agreement.html
+1 -1
View File
@@ -9,7 +9,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Accept our data sharing and financial agreement',
app/templates/views/api/callbacks/delivery-status-callback.html
+1 -1
View File
@@ -10,7 +10,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Callbacks for delivery receipts',
app/templates/views/api/callbacks/received-text-messages-callback.html
+1 -1
View File
@@ -14,7 +14,7 @@
back_link=url_for('.api_callbacks', service_id=current_service.id)
) }}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
When you receive a text message in Notify, we can forward it to your system.
Check the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.
app/templates/views/choose-account.html
+3 -3
View File
@@ -14,7 +14,7 @@
{{ heading }}
</h2>
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
<ul>
{% else %}
<ul>
@@ -62,7 +62,7 @@
Platform admin
</h2>
</div>
<ul class="column-three-quarters">
<ul class="govuk-grid-column-three-quarters">
<li class="browse-list-item">
<a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state">All organisations</a>
<p class="browse-list-hint">
@@ -106,7 +106,7 @@
<div class="govuk-grid-column-one-quarter">
&nbsp;
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% endif %}
{{ govukButton({
"element": "a",
app/templates/views/edit-email-template.html
+2 -2
View File
@@ -18,7 +18,7 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ textbox(form.name, width='1-1', hint='Your recipients will not see this', rows=10) }}
{{ textbox(form.subject, width='1-1', highlight_placeholders=True, rows=2) }}
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=8) }}
@@ -29,7 +29,7 @@
'Save'
) }}
</div>
<aside class="column-whole">
<aside class="govuk-grid-column-full">
{% include "partials/templates/guidance-formatting.html" %}
{% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-optional-content.html" %}
app/templates/views/edit-letter-template.html
+2 -2
View File
@@ -18,7 +18,7 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ textbox(form.name, width='1-1', hint='Your recipients will not see this', rows=10) }}
{{ textbox(form.subject, width='1-1', highlight_placeholders=True, rows=2) }}
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=8) }}
@@ -26,7 +26,7 @@
'Save'
) }}
</div>
<aside class="column-three-quarters">
<aside class="govuk-grid-column-three-quarters">
{% include "partials/templates/guidance-formatting-letters.html" %}
{% include "partials/templates/guidance-personalisation.html" %}
</aside>
app/templates/views/edit-sms-template.html
+1 -1
View File
@@ -30,7 +30,7 @@
'Save'
) }}
</div>
<aside class="column-whole">
<aside class="govuk-grid-column-full">
{% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-optional-content.html" %}
{% include "partials/templates/guidance-links.html" %}
app/templates/views/edit-user-permissions.html
+1 -1
View File
@@ -39,7 +39,7 @@
</p>
{% endif %}
<div class="govuk-grid-row">
{% call form_wrapper(class="column-three-quarters") %}
{% call form_wrapper(class="govuk-grid-column-three-quarters") %}
{% include 'views/manage-users/permissions.html' %}
app/templates/views/email-branding/manage-branding.html
+1 -1
View File
@@ -17,7 +17,7 @@
back_link=url_for('.email_branding')
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% if logo %}
<div id="logo-img">
<img src="https://{{ cdn_url }}/{{ logo }}"/>
app/templates/views/find-services/find-services-by-name.html
+1 -1
View File
@@ -18,7 +18,7 @@
action=url_for('.find_services_by_name'),
class='govuk-grid-row'
) %}
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{{ textbox(
form.search,
width='1-1',
app/templates/views/find-users/find-users-by-email.html
+1 -1
View File
@@ -18,7 +18,7 @@
action=url_for('.find_users_by_email'),
class='govuk-grid-row'
) %}
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{{ textbox(
form.search,
width='1-1',
app/templates/views/find-users/user-information.html
+1 -1
View File
@@ -7,7 +7,7 @@
{% block platform_admin_content %}
<div class="govuk-grid-row bottom-gutter">
<div class="column-whole">
<div class="govuk-grid-column-full">
<h1 class="heading-large">
{{ user.name }}
</h1>
app/templates/views/letter-branding/manage-letter-branding.html
+1 -1
View File
@@ -16,7 +16,7 @@
back_link=url_for('main.letter_branding')
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% if logo %}
<div id="logo-img">
<img src="https://{{ cdn_url }}/{{ logo }}"/>
app/templates/views/manage-users/confirm-edit-user-email.html
+1 -1
View File
@@ -15,7 +15,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{% call form_wrapper() %}
<p>New email address:</p>
<div class="panel panel-border-wide bottom-gutter">
app/templates/views/manage-users/confirm-edit-user-mobile-number.html
+1 -1
View File
@@ -15,7 +15,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{% call form_wrapper() %}
<p>New mobile number:</p>
<div class="panel panel-border-wide bottom-gutter">
app/templates/views/manage-users/edit-user-mobile.html
+1 -1
View File
@@ -17,7 +17,7 @@
<p id="user_name">This will change the mobile number for {{ user.name }}.</p>
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper(class="extra-tracking") %}
{{ textbox(form.mobile_number) }}
{{ page_footer('Save') }}
app/templates/views/notifications.html
+1 -1
View File
@@ -38,7 +38,7 @@
action=url_for('.view_notifications', service_id=current_service.id, message_type=message_type),
class="govuk-grid-row"
) %}
<div class="column-three-quarters {% if message_type == 'sms' %}extra-tracking{% endif %}">
<div class="govuk-grid-column-three-quarters {% if message_type == 'sms' %}extra-tracking{% endif %}">
{{ textbox(
search_form.to,
width='1-1',
app/templates/views/organisations/add-organisation.html
+1 -1
View File
@@ -20,7 +20,7 @@
<div class="govuk-grid-column-one-quarter">
&nbsp;
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
<main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
{% block beforeContent %}{% endblock %}
{% block content %}
app/templates/views/organisations/index.html
+2 -2
View File
@@ -23,7 +23,7 @@
All organisations
</h1>
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
@@ -51,7 +51,7 @@
<div class="govuk-grid-column-one-quarter">
&nbsp;
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{{ govukButton({
"element": "a",
"text": "New organisation",
app/templates/views/organisations/organisation/settings/edit-agreement.html
+1 -1
View File
@@ -15,7 +15,7 @@
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{% call form_wrapper() %}
{{ radios(
form.agreement_signed,
app/templates/views/organisations/organisation/settings/edit-crown-status.html
+1 -1
View File
@@ -15,7 +15,7 @@
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{% call form_wrapper() %}
{{ radios(form.crown_status) }}
{{ page_footer('Save') }}
app/templates/views/organisations/organisation/settings/edit-domains.html
+1 -1
View File
@@ -16,7 +16,7 @@
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
If a user’s email addresses ends with one of these domains then
any services they create will be associated with this organisation.
app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
+1 -1
View File
@@ -15,7 +15,7 @@
back_link=url_for('.organisation_settings', org_id=current_org.id)
) }}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
Text entered here will be displayed in the Zendesk ticket when a service
belonging to this organisation requests to go live.
app/templates/views/organisations/organisation/settings/edit-name/confirm.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ textbox(form.password, autocomplete='current-password') }}
app/templates/views/organisations/organisation/users/user/index.html
+1 -1
View File
@@ -19,7 +19,7 @@
{{ user.email_address }}
</p>
{% call form_wrapper(class="column-three-quarters") %}
{% call form_wrapper(class="govuk-grid-column-three-quarters") %}
{{ page_footer(
'Save',
delete_link=url_for('.remove_user_from_organisation', org_id=current_org.id, user_id=user.id) if user or None,
app/templates/views/platform-admin/_base_template.html
+1 -1
View File
@@ -34,7 +34,7 @@
{% endfor %}
</nav>
</div>
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% block platform_admin_content %}{% endblock %}
</div>
</div>
app/templates/views/providers/edit-provider.html
+1 -1
View File
@@ -11,7 +11,7 @@ Provider - {{provider.display_name}}
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{{ page_header(
provider.display_name,
app/templates/views/returned-letter-summary.html
+1 -1
View File
@@ -9,7 +9,7 @@
{% block maincolumn_content %}
<div class="grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Returned letters',
back_link=url_for('main.service_dashboard', service_id=current_service.id)
app/templates/views/service-settings/confirm.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ textbox(form.password, autocomplete='current-password') }}
app/templates/views/service-settings/delete.html
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
<h1 class="heading-large">Delete this service from GOV.UK Notify</h1>
app/templates/views/service-settings/email_reply_to.html
+2 -2
View File
@@ -40,7 +40,7 @@
{% endfor %}
</div>
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{% if current_user.has_permissions('manage_service') %}
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
@@ -51,7 +51,7 @@
</div>
{% endif %}
</div>
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
<p>
You need to add at least one reply-to address so recipients can reply to your messages.
</p>
app/templates/views/service-settings/estimate-usage.html
+1 -1
View File
@@ -12,7 +12,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{% if not form.at_least_one_volume_filled %}
{% call banner_wrapper(type='dangerous') %}
<h1 class='banner-title'>
app/templates/views/service-settings/letter-contact-details.html
+1 -1
View File
@@ -50,7 +50,7 @@
</div>
{% if current_user.has_permissions('manage_service') %}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
"element": "a",
app/templates/views/service-settings/letter-contact/add.html
+1 -1
View File
@@ -16,7 +16,7 @@
back_link=back_link
) }}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{% call form_wrapper() %}
{{ textbox(
form.letter_contact_block,
app/templates/views/service-settings/request-to-go-live.html
+1 -1
View File
@@ -10,7 +10,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{{ page_header(
'Before you request to go live',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/send-files-by-email.html
+1 -1
View File
@@ -12,7 +12,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Send files by email',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-auth-type.html
+1 -1
View File
@@ -10,7 +10,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Sign-in method',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-email.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Send emails',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-inbound-sms.html
+1 -1
View File
@@ -10,7 +10,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Receive text messages',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-international-sms.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Send international text messages',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-letter.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Send letters',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-service-setting.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
title,
back_link=url_for('.service_settings', service_id=current_service.id)
app/templates/views/service-settings/set-sms.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Send text messages',
back_link=url_for('main.service_settings', service_id=current_service.id)
app/templates/views/service-settings/sms-senders.html
+1 -1
View File
@@ -44,7 +44,7 @@
{% if current_user.has_permissions('manage_service') %}
<div class="govuk-grid-row bottom-gutter">
<div class="column-whole">
<div class="govuk-grid-column-full">
{{ govukButton({
"element": "a",
"text": "Add text message sender",
app/templates/views/styleguide.html
+2 -2
View File
@@ -25,7 +25,7 @@
<h2 class="heading-large">Banner</h2>
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
<p>Used to show the status of a thing or action.</p>
{{ banner("You sent 1,234 text messages", with_tick=True) }}
@@ -110,7 +110,7 @@
<h2 class="heading-large">Tables</h2>
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
<p>
Used for comparing rows of data.
</p>
app/templates/views/templates/_template.html
+2 -2
View File
@@ -1,7 +1,7 @@
{% from 'components/message-count-label.html' import message_count_label %}
{% from "components/banner.html" import banner_wrapper %}
<div class="column-whole">
<div class="govuk-grid-column-full">
{% if template._template.archived %}
<p class="hint">
This template was deleted {{ template._template.updated_at|format_datetime_relative }}.
@@ -48,7 +48,7 @@
</div>
{% endif %}
</div>
<div class="column-whole template-container">
<div class="govuk-grid-column-full template-container">
{% if current_user.has_permissions('manage_templates') and template.template_type == 'letter' %}
{% if not current_service.letter_branding_id %}
<a href="{{ url_for(".branding_request", service_id=current_service.id, branding_type="letter", from_template=template.id) }}" class="govuk-link govuk-link--no-visited-state edit-template-link-letter-branding">Add logo</a>
app/templates/views/templates/_template_history.html
+2 -2
View File
@@ -1,4 +1,4 @@
<div class="column-whole">
<div class="govuk-grid-column-full">
<h2 class="message-name">{{ template.name }}</h2>
<p class="hint">
{% if template.get_raw('version', 1) > 1 %}
@@ -11,6 +11,6 @@
</p>
</div>
<div class="column-whole">
<div class="govuk-grid-column-full">
{{ template|string }}
</div>
app/templates/views/templates/action_blocked.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'{} are disabled'.format(notification_type.capitalize()),
back_link=back_link,
app/templates/views/templates/breaking-change.html
+1 -1
View File
@@ -16,7 +16,7 @@
back_link=url_for(".edit_service_template", service_id=current_service.id, template_id=new_template.id)
) }}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{% if template_change.placeholders_removed %}
<p>
You removed {{ list_of_placeholders(template_change.placeholders_removed) }}
app/templates/views/templates/choose-reply.html
+1 -1
View File
@@ -35,7 +35,7 @@
{% else %}
{{ live_search(target_selector='#template-list .column-whole', show=True, form=search_form) }}
{{ live_search(target_selector='#template-list .govuk-grid-column-full', show=True, form=search_form) }}
<nav id="template-list">
{% for item in templates_and_folders %}
app/templates/views/templates/choose.html
+2 -2
View File
@@ -44,7 +44,7 @@
{% else %}
<div class="govuk-grid-row">
<div class="{% if current_user.has_permissions('manage_templates') %} column-five-sixths {% else %} column-whole {% endif %}">
<div class="{% if current_user.has_permissions('manage_templates') %} govuk-grid-column-five-sixths {% else %} govuk-grid-column-full {% endif %}">
{{ folder_path(
folders=template_folder_path,
service_id=current_service.id,
@@ -53,7 +53,7 @@
) }}
</div>
{% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
<div class="column-one-sixth">
<div class="govuk-grid-column-one-sixth">
<a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="govuk-link govuk-link--no-visited-state folder-heading-manage-link">Manage<span class="govuk-visually-hidden"> this folder</span></a>
</div>
{% endif %}
app/templates/views/templates/edit-template-postage.html
+2 -2
View File
@@ -16,11 +16,11 @@
) }}
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ radios(form.postage) }}
{{ page_footer('Save') }}
</div>
<aside class="column-three-quarters">
<aside class="govuk-grid-column-three-quarters">
{% include "partials/templates/guidance-postage.html" %}
</aside>
</div>
app/templates/views/templates/manage-template-folder.html
+1 -1
View File
@@ -12,7 +12,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row bottom-gutter-1-2">
<div class="column-whole">
<div class="govuk-grid-column-full">
{{ folder_path(
folders=template_folder_path,
service_id=current_service.id,
app/templates/views/templates/set-sender.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ radios(
form.sender,
app/templates/views/templates/set-template-sender.html
+1 -1
View File
@@ -15,7 +15,7 @@
back_link=url_for('.view_template', service_id=current_service.id, template_id=template_id)
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ radios(
form.sender,
app/templates/views/templates/template.html
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
{% else %}
<div class="govuk-grid-row">
<div class="column-whole">
<div class="govuk-grid-column-full">
{{ folder_path(
folders=current_service.get_template_path(template._template),
service_id=current_service.id,
app/templates/views/uploads/choose-file.html
+1 -1
View File
@@ -9,7 +9,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{% if error %}
{% call banner_wrapper(type='dangerous') %}
<h1 class="banner-title">{{ error.title }}</h1>
app/templates/views/user-profile/authenticate.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper(autocomplete=True) %}
{{ textbox(form.password, autocomplete='current-password') }}
app/templates/views/user-profile/change-password.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper(autocomplete=True) %}
{{ textbox(form.old_password) }}
{{ textbox(form.new_password) }}
app/templates/views/user-profile/change.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ textbox(form_field, safe_error_message=True) }}
{{ page_footer('Save') }}
app/templates/views/user-profile/confirm.html
+1 -1
View File
@@ -16,7 +16,7 @@
) }}
<div class="govuk-grid-row">
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
<p>
We’ve sent a security code to your new {{ thing }}.
</p>
app/templates/views/user-profile/disable-platform-admin-view.html
+1 -1
View File
@@ -11,7 +11,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-five-sixths">
<div class="govuk-grid-column-five-sixths">
{{ page_header(
'Use platform admin view',
back_link=url_for('.user_profile')
app/templates/withnav_template.html
+1 -1
View File
@@ -31,7 +31,7 @@
{% if help %}
<div class="govuk-grid-column-two-thirds">
{% else %}
<div class="column-three-quarters">
<div class="govuk-grid-column-three-quarters">
{% endif %}
{% block beforeContent %}{% endblock %}
<main class="govuk-main-wrapper column-main {{ mainClasses }}" id="main-content" role="main">
tests/app/main/views/test_agreement.py
+1 -1
View File
@@ -97,7 +97,7 @@ def test_show_agreement_page(
mocker.patch('app.organisations_client.get_service_organisation', return_value=org)
page = client_request.get('main.service_agreement', service_id=SERVICE_ONE_ID)
links = page.select('main .column-five-sixths a')
links = page.select('main .govuk-grid-column-five-sixths a')
assert len(links) == len(expected_links)
for index, link in enumerate(links):
classes, url = expected_links[index]
tests/app/main/views/test_email_branding.py
+1 -1
View File
@@ -29,7 +29,7 @@ def test_email_branding_page_shows_full_branding_list(
page.select_one('h1').text
) == "Email branding"
assert page.select('.column-three-quarters a')[-1]['href'] == url_for('main.create_email_branding')
assert page.select('.govuk-grid-column-three-quarters a')[-1]['href'] == url_for('main.create_email_branding')
assert brand_names == [
'org 1',
tests/app/main/views/test_letter_branding.py
+1 -1
View File
@@ -32,7 +32,7 @@ def test_letter_branding_page_shows_full_branding_list(
page.select_one('h1').text
) == "Letter branding"
assert page.select('.column-three-quarters a')[-1]['href'] == url_for('main.create_letter_branding')
assert page.select('.govuk-grid-column-three-quarters a')[-1]['href'] == url_for('main.create_letter_branding')
assert brand_names == [
'HM Government',
tests/app/main/views/test_templates.py
+2 -2
View File
@@ -2189,7 +2189,7 @@ def test_add_sender_link_only_appears_on_services_with_no_senders(
template_id=fake_uuid,
)
assert page.select_one('.column-three-quarters form > a')['href'] == url_for(
assert page.select_one('.govuk-grid-column-three-quarters form > a')['href'] == url_for(
'main.service_add_letter_contact',
service_id=SERVICE_ONE_ID,
from_template=fake_uuid,
@@ -2212,6 +2212,6 @@ def test_set_template_sender_escapes_letter_contact_block_names(
# use decode_contents, which returns the raw html, rather than text, which sanitises it and makes
# testing confusing
radio_text = page.select_one('.column-three-quarters label[for="sender-1"]').decode_contents()
radio_text = page.select_one('.govuk-grid-column-three-quarters label[for="sender-1"]').decode_contents()
assert "&lt;script&gt;" in radio_text
assert "<script>" not in radio_text
tests/javascripts/stick-to-window-when-scrolling.test.js
+2 -2
View File
@@ -78,7 +78,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
document.body.innerHTML = `
<div class="govuk-grid-row">
<main class="column-three-quarters column-main">
<main class="govuk-grid-column-three-quarters column-main">
<form method="post" autocomplete="off">
<div class="govuk-grid-row js-stick-at-top-when-scrolling">
<div class="govuk-grid-column-two-thirds ">
@@ -669,7 +669,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
beforeEach(() => {
document.body.innerHTML = `
<main role="main" class="column-three-quarters column-main">
<main role="main" class="govuk-grid-column-three-quarters column-main">
<a class="govuk-back-link" href="">Back</a>
<h1 class="heading-large js-header">
Preview of ‘Content email’