From 73e3f3e3ee9c2e53acb32b5bfc3bc43bf2c75e55 Mon Sep 17 00:00:00 2001
From: mlloydbixal <amanda.lloyd@gsa.gov>
Date: Thu, 11 Jul 2024 19:31:39 -0400
Subject: [PATCH] VOTE-2328: move main-content id fixing andi tab order

---
 .../templates/layout/page--node--landing.html.twig        | 5 ++---
 .../templates/layout/page--node--voter-guide.html.twig    | 3 +--
 web/themes/custom/votegov/templates/layout/page.html.twig | 8 ++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig b/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
index c1d286991..983933a45 100644
--- a/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
+++ b/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
@@ -1,9 +1,8 @@
 {% extends "page.html.twig" %}
 
 {% block main %}
-  <main role="main" id="main">
-    {# link is in html.html.twig #}
-    <a id="main-content" tabindex="-1"></a>
+  <main role="main" id="main-content">
+
     {{ page.content }}
   </main>
 {% endblock %}
diff --git a/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig b/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig
index 4512adebf..bf9b8b68a 100644
--- a/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig
+++ b/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig
@@ -2,8 +2,7 @@
 {% set title = drupal_title() %}
 
 {% block main %}
-  <main role="main" id="main">
-    <a id="main-content" tabindex="-1"></a>
+  <main role="main" id="main-content">
     <section class="vote-hero vote-hero--dark">
       <div class="vote-hero__container">
         <div class="vote-hero__callout">
diff --git a/web/themes/custom/votegov/templates/layout/page.html.twig b/web/themes/custom/votegov/templates/layout/page.html.twig
index de6a04eda..1d505d062 100644
--- a/web/themes/custom/votegov/templates/layout/page.html.twig
+++ b/web/themes/custom/votegov/templates/layout/page.html.twig
@@ -97,9 +97,7 @@
 
 {% block main %}
   {% if page.sidebar %}
-    <section class="grid-container content-container">
-      {# link is in html.html.twig #}
-      <a id="main-content" tabindex="-1"></a>
+    <section id="main-content" class="grid-container content-container">
       <div class="page-masthead {{ node_image ? "page-masthead--image-offset" }}">
         {# Breadcrumbs component. #}
         {{ drupal_entity('block', 'votegov_breadcrumbs') }}
@@ -117,9 +115,7 @@
       </div>
     </section>
   {% else %}
-    <main role="main" id="main" class="grid-container content-container">
-      {# link is in html.html.twig #}
-      <a id="main-content" tabindex="-1"></a>
+    <main role="main" id="main-content" class="grid-container content-container">
       <div class="page-masthead {{ node_image ? "page-masthead--image-offset" }}">
         {# Breadcrumbs component. #}
         {{ drupal_entity('block', 'votegov_breadcrumbs') }}