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

Replace column-full with govuk-grid-column-full

Browse Source
This commit is contained in:
Katie Smith
2020-02-19 12:23:56 +00:00
parent b9b9a138f9
commit 076d99c9dc
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/previewPane.js
View File

@@ -10,7 +10,7 @@
branding_style = branding_style.val(); branding_style = branding_style.val();
const $paneWrapper = $('<div class="column-full"></div>'); const $paneWrapper = $('<div class="govuk-grid-column-full"></div>');
const $form = $('form'); const $form = $('form');
const previewType = $form.data('previewType'); const previewType = $form.data('previewType');
const $previewPane = $(`<iframe src="/_${previewType}?${buildQueryString(['branding_style', branding_style])}" class="branding-preview"></iframe>`); const $previewPane = $(`<iframe src="/_${previewType}?${buildQueryString(['branding_style', branding_style])}" class="branding-preview"></iframe>`);

2
app/templates/views/organisations/organisation/settings/preview-email-branding.html
View File

@@ -10,7 +10,7 @@
<h1 class="heading-large">Preview email branding</h1> <h1 class="heading-large">Preview email branding</h1>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
<iframe src="{{ url_for('main.email_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe> <iframe src="{{ url_for('main.email_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe>
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<div class="form-group"> <div class="form-group">

2
app/templates/views/organisations/organisation/settings/preview-letter-branding.html
View File

@@ -9,7 +9,7 @@
<h1 class="heading-large">Preview letter branding</h1> <h1 class="heading-large">Preview letter branding</h1>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
<iframe src="{{ url_for('main.letter_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe> <iframe src="{{ url_for('main.letter_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe>
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<div class="form-group"> <div class="form-group">

4
app/templates/views/organisations/organisation/settings/set-email-branding.html
View File

@@ -17,11 +17,11 @@
) }} ) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %} {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full preview-pane"> <div class="govuk-grid-column-full preview-pane">
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
{{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search branding styles by name') }} {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search branding styles by name') }}
{{ radios(form.branding_style) }} {{ radios(form.branding_style) }}
</div> </div>

4
app/templates/views/organisations/organisation/settings/set-letter-branding.html
View File

@@ -17,11 +17,11 @@
) }} ) }}
{% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %} {% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full preview-pane"> <div class="govuk-grid-column-full preview-pane">
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
{{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }} {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }}
{{ radios(form.branding_style, hide_legend=True) }} {{ radios(form.branding_style, hide_legend=True) }}
</div> </div>

2
app/templates/views/service-settings/data-retention.html
View File

@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="govuk-grid-row bottom-gutter"> <div class="govuk-grid-row bottom-gutter">
<div class="column-full"> <div class="govuk-grid-column-full">
By default data is kept for 7 days By default data is kept for 7 days
</div> </div>
</div> </div>

2
app/templates/views/service-settings/preview-email-branding.html
View File

@@ -10,7 +10,7 @@
<h1 class="heading-large">Preview email branding</h1> <h1 class="heading-large">Preview email branding</h1>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
<iframe src="{{ url_for('main.email_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe> <iframe src="{{ url_for('main.email_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe>
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<div class="form-group"> <div class="form-group">

2
app/templates/views/service-settings/preview-letter-branding.html
View File

@@ -10,7 +10,7 @@
<h1 class="heading-large">Preview letter branding</h1> <h1 class="heading-large">Preview letter branding</h1>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
<iframe src="{{ url_for('main.letter_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe> <iframe src="{{ url_for('main.letter_template', branding_style=form.branding_style.data) }}" class="branding-preview"></iframe>
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<div class="form-group"> <div class="form-group">

4
app/templates/views/service-settings/set-email-branding.html
View File

@@ -17,11 +17,11 @@
) }} ) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %} {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full preview-pane"> <div class="govuk-grid-column-full preview-pane">
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
{{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search branding styles by name') }} {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search branding styles by name') }}
{{ radios(form.branding_style) }} {{ radios(form.branding_style) }}
</div> </div>

4
app/templates/views/service-settings/set-letter-branding.html
View File

@@ -17,11 +17,11 @@
) }} ) }}
{% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %} {% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full preview-pane"> <div class="govuk-grid-column-full preview-pane">
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
{{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }} {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }}
{{ radios(form.branding_style, hide_legend=True) }} {{ radios(form.branding_style, hide_legend=True) }}
</div> </div>

4
tests/javascripts/previewPane.test.js
View File

@@ -63,7 +63,7 @@ describe('Preview pane', () => {
`<form method="post" action="${emailPageURL}" autocomplete="off" data-preview-type="email" novalidate> `<form method="post" action="${emailPageURL}" autocomplete="off" data-preview-type="email" novalidate>
<div class="govuk-grid-row"></div> <div class="govuk-grid-row"></div>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="column-full"> <div class="govuk-grid-column-full">
<div data-module="autofocus"> <div data-module="autofocus">
<div class="live-search js-header" data-module="live-search" data-targets=".multiple-choice"> <div class="live-search js-header" data-module="live-search" data-targets=".multiple-choice">
<div class="form-group"> <div class="form-group">
@@ -81,7 +81,7 @@ describe('Preview pane', () => {
</div> </div>
</form>`; </form>`;
document.querySelector('.column-full').appendChild(helpers.getRadioGroup(brands)); document.querySelector('.govuk-grid-column-full').appendChild(helpers.getRadioGroup(brands));
form = document.querySelector('form'); form = document.querySelector('form');
radios = form.querySelector('fieldset'); radios = form.querySelector('fieldset');