VOTE-2328: move main-content id fixing andi tab order (#843)

usagov · Jul 11, 2024 · 9e9e372 · 9e9e372
1 parent 833f791
commit 9e9e372
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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') }}