Merge branch 'main' into notify-admin-211

app/main/views/api_keys.py

@@ -93,7 +93,7 @@ def create_api_key(service_id):
             'hint': {
                 'html': Markup(
                     'Not available because your service is in '
-                    '<a class="govuk-link govuk-link--no-visited-state" href="/features/trial-mode">trial mode</a>')
+                    '<a class="usa-link" href="/features/trial-mode">trial mode</a>')
             }
         }
     if form.validate_on_submit():

app/main/views/invites.py

@@ -22,7 +22,7 @@ def accept_invite(token):
         message = Markup("""
             You’re signed in as {}.
             This invite is for another email address.
-            <a href={} class="govuk-link govuk-link--no-visited-state">Sign out</a>
+            <a href={} class="usa-link">Sign out</a>
             and click the link again to accept this invite.
             """.format(
             current_user.email_address,
@@ -82,7 +82,7 @@ def accept_org_invite(token):
         message = Markup("""
             You’re signed in as {}.
             This invite is for another email address.
-            <a class="govuk-link govuk-link--no-visited-state" href={}>Sign out</a>
+            <a class="usa-link" href={}>Sign out</a>
             and click the link again to accept this invite.
             """.format(
             current_user.email_address,

app/main/views/sign_in.py

@@ -64,7 +64,7 @@ def sign_in():
         flash(Markup(
             (
                 f"The email address or password you entered is incorrect."
-                f"&ensp;<a href={password_reset_url} class='govuk-link'>Forgot your password?</a>"
+                f"&ensp;<a href={password_reset_url} class='usa-link'>Forgot your password?</a>"
             )
         ))