Replace column-two-thirds with govuk-grid-column-two-thirds

app/templates/content_template.html

@@ -16,7 +16,7 @@
       </div>
       <div class="column-five-eighths">
     {% else %}
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
     {% endif %}
 
     {% block content_column_content %}

app/templates/error/401.html

@@ -2,7 +2,7 @@
 {% block per_page_title %}You’re not authorised to see this page{% endblock %}
 {% block maincolumn_content %}
   <div class="govuk-grid-row">
-    <div class="column-two-thirds">
+    <div class="govuk-grid-column-two-thirds">
     <h1>You’re not authorised to see this page</h1>
       <p><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.sign_in' )}}">Sign in</a> to GOV.UK Notify and try again.</p>
   </div>

app/templates/error/403.html

@@ -2,7 +2,7 @@
 {% block per_page_title %}You’re not allowed to see this page{% endblock %}
 {% block maincolumn_content %}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <h1 class="heading-large">
           You’re not allowed to see this page
         </h1>

app/templates/error/404.html

@@ -2,7 +2,7 @@
 {% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <h1 class="heading-large">
           Page not found
         </h1>

app/templates/error/410.html

@@ -2,7 +2,7 @@
 {% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <h1 class="heading-large">
           Page not found
         </h1>

app/templates/error/413.html

@@ -2,12 +2,12 @@
 {% block per_page_title %}File too big{% endblock %}
 {% block maincolumn_content %}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <h1 class="heading-large">
           The file you uploaded was too big
         </h1>
         <div class="govuk-grid-row">
-          <div class="column-two-thirds">
+          <div class="govuk-grid-column-two-thirds">
             <p>
               Files must be smaller than 5 MB.
             </p>

app/templates/error/500.html

@@ -2,7 +2,7 @@
 {% block per_page_title %}Sorry, there’s a problem with the service{% endblock %}
 {% block maincolumn_content %}
   <div class="govuk-grid-row">
-    <div class="column-two-thirds">
+    <div class="govuk-grid-column-two-thirds">
       <h1 class="heading-large">
         Sorry, there’s a problem with GOV.UK Notify
       </h1>

app/templates/views/add-service.html

@@ -12,7 +12,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
 
     {{ page_header('About your service') }}
 

app/templates/views/agreement/agreement-public.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
 
     <h1 class="heading-large">
       Download the GOV.UK Notify data sharing and financial agreement

app/templates/views/api/whitelist.html

@@ -48,7 +48,7 @@
   {% call form_wrapper() %}
 
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
 
         {{ list_entry(
           form.email_addresses,

app/templates/views/cancelled-invitation.html

@@ -2,7 +2,7 @@
 {% block per_page_title %}Invitation has been cancelled{% endblock %}
 {% block maincolumn_content %}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <h1 class="heading-large">
           The invitation you were sent has been cancelled
         </h1>

app/templates/views/conversations/messages.html

@@ -2,7 +2,7 @@
   {% for message in conversation %}
     <div class="govuk-grid-row sms-message-row" id="n{{ message.id }}" tabindex="0">
       {% if message.inbound %}
-        <div class="column-two-thirds sms-message-inbound">
+        <div class="govuk-grid-column-two-thirds sms-message-inbound">
           {{ message.content | string }}
           <div class="sms-message-status">
             {{ message.created_at | format_datetime_relative }}
@@ -12,7 +12,7 @@
         <div class="govuk-grid-column-one-third">
           &nbsp;
         </div>
-        <div class="column-two-thirds">
+        <div class="govuk-grid-column-two-thirds">
           {{ message.content | string }}
           {% if message.status == 'delivered' %}
             <div class="sms-message-status sms-message-status-outbound">

app/templates/views/cookies.html

@@ -10,7 +10,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1">
       <h2 class="banner-title">Your cookie settings were saved</h2>
       <a class="govuk_link cookie-settings__prev-page govuk-!-margin-top-1" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">

app/templates/views/edit-sms-template.html

@@ -18,10 +18,10 @@
 
     {% call form_wrapper() %}
       <div class="govuk-grid-row">
-        <div class="column-two-thirds">
+        <div class="govuk-grid-column-two-thirds">
           {{ textbox(form.name, width='1-1', hint='Your recipients will not see this') }}
         </div>
-        <div class="column-two-thirds">
+        <div class="govuk-grid-column-two-thirds">
           {{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=5) }}
           {% if current_user.platform_admin %}
             {{ radios(form.process_type) }}

app/templates/views/email-link-invalid.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">The link has expired</h1>
 
     <p><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.sign_in') }}">Sign in again</a> to get a new link.</p>

app/templates/views/email-not-received.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Resend email link</h1>
 
     <p>Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.</p>

app/templates/views/forgot-password.html

@@ -10,7 +10,7 @@ Create a new password
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Forgotten your password?</h1>
 
     <p>We’ll send you an email to create a new password.</p>

app/templates/views/inbound-sms-admin.html

@@ -21,7 +21,7 @@ Inbound Numbers
 {% block platform_admin_content %}
 
   <div class="govuk-grid-row bottom-gutter">
-    <div class="column-two-thirds">
+    <div class="govuk-grid-column-two-thirds">
       <h1 class="heading-large">
         Inbound SMS
       </h1>

app/templates/views/integration-testing.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Integration testing</h1>
 
     <p>This information has moved.</p>

app/templates/views/new-password.html

@@ -10,7 +10,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     {% if user %}
       <h1 class="heading-large">
         Create a new password

app/templates/views/password-reset-sent.html

@@ -7,7 +7,7 @@ Check your email
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Check your email</h1>
 
     <p>Click the link in the email to reset your password.</p>

app/templates/views/platform-admin/returned-letters.html

@@ -10,7 +10,7 @@
 {% block platform_admin_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Submit returned letters</h1>
     {% call form_wrapper() %}
       {{ textbox(form.references, width='1-1', rows=8, autosize=True) }}

app/templates/views/privacy.html

@@ -7,7 +7,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Privacy notice: how we use your data</h1>
 
     <p>Last update: 5 March 2019</p>

app/templates/views/providers/edit-sms-provider-ratio.html

@@ -21,7 +21,7 @@
     <div class="history-list-item">
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-one-third">&nbsp;</div>
-        <div class="column-two-thirds">
+        <div class="govuk-grid-column-two-thirds">
           <div class="history-list-percentage-without-border">
             <div class="history-list-percentage-left-label">
               {{ primary_provider }}
@@ -70,7 +70,7 @@
                 </div>
               {% endif %}
             </div>
-            <div class="column-two-thirds">
+            <div class="govuk-grid-column-two-thirds">
               <div class="history-list-percentage">
                 <div class="history-list-percentage-left-label">
                   {{ primary_provider }}<br><br>

app/templates/views/providers/provider.html

@@ -10,7 +10,7 @@ Provider versions
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
 
     {{ page_header(
       provider_versions[0].display_name,

app/templates/views/re-validate-email-sent.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">{{ title }}</h1>
     <p>For security, we need to check if you still have access to your email address.</p>
     <p>We’ve sent you a link to sign in to Notify. The link will open in a new browser window, so you can close this one.</p>

app/templates/views/register-from-invite.html

@@ -10,7 +10,7 @@ Create an account
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Create an account</h1>
     <p>
       Your account will be created with this email address:

app/templates/views/register-from-org-invite.html

@@ -10,7 +10,7 @@ Create an account
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Create an account</h1>
     <p>Your account will be created with this email: {{invited_org_user.email_address}}</p>
     {% call form_wrapper() %}

app/templates/views/register.html

@@ -10,7 +10,7 @@ Create an account
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Create an account</h1>
     {% call form_wrapper(autocomplete=True) %}
       {{ textbox(form.name, width='3-4') }}

app/templates/views/send-test.html

@@ -22,7 +22,7 @@
     data_kwargs={'force-focus': True}
   ) %}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
+      <div class="govuk-grid-column-two-thirds {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
         {{ textbox(
           form.placeholder_value,
           hint='Optional' if optional_placeholder else None,

app/templates/views/service-settings/data-retention.html

@@ -10,7 +10,7 @@
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row bottom-gutter">
-    <div class="column-two-thirds">
+    <div class="govuk-grid-column-two-thirds">
       <h1 class="heading-large">
         Data retention
       </h1>

app/templates/views/signedout.html

@@ -24,7 +24,7 @@
        </ol>
       </nav>
       <div class="govuk-grid-row">
-        <div class="column-two-thirds">
+        <div class="govuk-grid-column-two-thirds">
           <h1>
             Send emails, text messages and letters to your users
           </h1>

app/templates/views/signin.html

@@ -10,7 +10,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
 
     {% if again %}
       <h1 class="heading-large">You need to sign in again</h1>

app/templates/views/support/ask-question-give-feedback.html

@@ -15,7 +15,7 @@
       back_link=url_for('.support')
     ) }}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         {% call form_wrapper() %}
             {{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }}
             {% if not current_user.is_authenticated %}

app/templates/views/support/bat-phone.html

@@ -12,7 +12,7 @@
       Out of hours emergencies
     </h1>
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <p>
           First, check the
           <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk">system status page</a>.

app/templates/views/support/index.html

@@ -10,7 +10,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
 
     <h1 class="heading-large">Support</h1>
     <p>We provide 24-hour online support for teams with a live service on GOV.UK Notify.</p>

app/templates/views/support/report-problem.html

@@ -16,7 +16,7 @@
       back_link=url_for('.support')
     ) }}
     <div class="govuk-grid-row">
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <div class="panel panel-border-wide">
           <p>
             Check our <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk">system status</a>

app/templates/views/support/triage.html

@@ -11,7 +11,7 @@
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
-    <div class="column-two-thirds">
+    <div class="govuk-grid-column-two-thirds">
       {{ page_header(
         'Report a problem',
         back_link=url_for('.support')

app/templates/views/temp-history.html

@@ -41,7 +41,7 @@
                 {{ event.time|format_time }}
               </div>
             </div>
-            <div class="column-two-thirds">
+            <div class="govuk-grid-column-two-thirds">
               {{ event }}
             </div>
         </li>

app/templates/views/text-not-received.html

@@ -10,7 +10,7 @@ Check your mobile number
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Check your mobile number</h1>
 
     <p>Check your mobile phone number is correct and then resend the security code.</p>

app/templates/views/two-factor-email.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">{{ title }}</h1>
     <p>We’ve emailed you a link to sign in to Notify.</p>
     <p>Clicking the link will open Notify in a new browser window, so you can close this one.</p>

app/templates/views/two-factor.html

@@ -11,7 +11,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Check your phone</h1>
 
     <p>We’ve sent you a text message with a security code.</p>

app/templates/views/usage.html

@@ -129,7 +129,7 @@
           Financial year ends 31 March
         </p>
       </div>
-      <div class="column-two-thirds">
+      <div class="govuk-grid-column-two-thirds">
         <p class="align-with-heading-copy">
           What counts as 1 text message?<br />
           See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing') }}">pricing</a>.

app/templates/views/using-notify.html

@@ -11,7 +11,7 @@
   <div class="govuk-grid-column-one-third">
     {{ sub_navigation(navigation_links) }}
   </div>
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
 
     <h1 class="heading-large">Using Notify</h1>
 

app/templates/views/verification-not-received.html

@@ -8,7 +8,7 @@
 {% block maincolumn_content %}
 
 <div class="govuk-grid-row">
-  <div class="column-two-thirds">
+  <div class="govuk-grid-column-two-thirds">
     <h1 class="heading-large">Resend security code</h1>
 
     <p>Text messages sometimes take a few minutes to arrive. If you do not receive a security code, Notify can send you a new one.</p>

app/templates/withnav_template.html

@@ -29,7 +29,7 @@
           {% include "main_nav.html" %}
         </div>
       {% if help %}
-        <div class="column-two-thirds">
+        <div class="govuk-grid-column-two-thirds">
       {% else %}
         <div class="column-three-quarters">
       {% endif %}

tests/javascripts/stick-to-window-when-scrolling.test.js

@@ -81,7 +81,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
           <main class="column-three-quarters column-main">
             <form method="post" autocomplete="off">
               <div class="govuk-grid-row js-stick-at-top-when-scrolling">
-                <div class="column-two-thirds ">
+                <div class="govuk-grid-column-two-thirds ">
                   <div class="form-group" data-module="">
                     <label class="form-label" for="placeholder_value">
                       name