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

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-02-20 16:55:56 +00:00
parent e2952e6a7a
commit a85f7fa2c1
77 changed files with 117 additions and 111 deletions

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') }}

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>

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>

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'>

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",

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,

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)

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)

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)

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)

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)

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)

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)

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)

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)

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",