Removing or changing more govuk styles

app/assets/error_pages/5xx.html

@@ -66,7 +66,7 @@
   </header>
 
   <div class="govuk-width-container">
-    <main class="govuk-main-wrapper govuk-!-padding-top-0" id="main-content" role="main">
+    <main class="govuk-main-wrapper" id="main-content" role="main">
       <div class="grid-row">
         <div class="grid-col-12">
           <h1 class="govuk-heading-l govuk-!-padding-top-7">
@@ -85,25 +85,25 @@
     </main>
   </div>
 
-  <footer class="govuk-footer " role="contentinfo">
+  <footer class="usa-footer " role="contentinfo">
     <div class="govuk-width-container ">
-      <div class="govuk-footer__meta">
-        <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+      <div class="usa-footer__meta">
+        <div class="usa-footer__meta-item usa-footer__meta-item--grow">
 
           <h2 class="usa-sr-only">Support links</h2>
-          <div class="govuk-footer__meta-custom">
+          <div class="usa-footer__meta-custom">
             Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
-              class="govuk-footer__link">Technology Transformation Services</a>
+              class="usa-footer__link">Technology Transformation Services</a>
           </div>
 
-          <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"
+          <svg role="presentation" focusable="false" class="usa-footer__licence-logo"
             xmlns="http://www.w3.org/2000/svg" viewbox="0 0 483.2 195.7" height="17" width="41">
             <path fill="currentColor"
               d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
           </svg>
-          <span class="govuk-footer__licence-description">
+          <span class="usa-footer__licence-description">
             All content is available under the
-            <a class="govuk-footer__link"
+            <a class="usa-footer__link"
               href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open
               Government Licence v3.0</a>, except where otherwise stated
           </span>

app/assets/javascripts/collapsibleCheckboxes.js

@@ -20,7 +20,7 @@
     }[field] || `No ${field}s`)
   };
   Summary.prototype.addContent = function() {
-    const $hint = this.module.$formGroup.find('.govuk-hint');
+    const $hint = this.module.$formGroup.find('.usa-hint');
     this.$text = $(`<p class="selection-summary__text" />`);
 
     if (this.fieldLabel === 'folder') { this.$text.addClass('selection-summary__text--folders'); }

app/assets/javascripts/errorBanner.js

@@ -9,9 +9,9 @@
   This may behave in unexpected ways if you have more than one element with the `banner-dangerous` class on your page.
   */
   window.GOVUK.ErrorBanner = {
-    hideBanner: () => $('.banner-dangerous').addClass('govuk-!-display-none'),
+    hideBanner: () => $('.banner-dangerous').addClass('display-none'),
     showBanner: () => $('.banner-dangerous')
-      .removeClass('govuk-!-display-none')
+      .removeClass('display-none')
       .trigger('focus'),
   };
 })(window);

app/assets/sass/uswds/_uswds-theme-custom-styles.scss

@@ -143,7 +143,7 @@ td.table-empty-message {
 }
 
 .usa-checkbox .usa-checkbox__label {
-   + a.template-list-folder, + a.usa-template-list-template {
+   + a.template-list-folder {
       margin-left: units(4);
    }
 }
@@ -165,7 +165,7 @@ td.table-empty-message {
    margin: 0 units(0.5);
 }
 
-.usa-template-list-template, .template-list-template {
+.template-list-template {
    background: url(../img/material-icons/description.svg) no-repeat;
    padding-left: units(4);
    display: inline-flex;