Skip to content

Commit

Permalink
Merge branch 'main' into task/remove-ff-template-cat
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewleith authored Oct 2, 2024
2 parents 9c87686 + 9916ce6 commit cebc847
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/templates/components/tou-prompt.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

{% macro tou_prompt() %}

<h1 class="heading-large mt-0 mb-4" tabindex="0" data-testid="tou-heading" autofocus>{{ _('Before you continue') }}</h1>
<div id="tou-prompt" data-testid="tou-prompt" class="mt-16 mb-10">
<h1 class="heading-large mt-0 mb-4" tabindex="0" autofocus>{{ _('Before you continue') }}</h1>
<div class="mt-16 mb-10">
<h2 class="heading-medium">{{ _('Review your activity') }}</h1>
<p>{{ _('Our records show that these are the last 3 times you signed into this account:') }}</p>
<table>
Expand Down
2 changes: 1 addition & 1 deletion tests_cypress/cypress/e2e/admin/template-categories.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe("Template categories", () => {
const categories = {
OTHER: "Other",
AUTH: "Authentication",
AUTOREPLY: "Automatic reply",
AUTOREPLY: "General communication",
};

templates.forEach((template) => {
Expand Down

0 comments on commit cebc847

Please sign in to comment.