Revert "Issue #2784311 by Jmdrawneek@googlemail.com, mgifford,...

Revert "Issue #2784311 by Jmdrawneek@googlemail.com, mgifford, andrewmacpherson, xjm, Cottser, tim.plunkett, dman, DomoSapiens: Skip to main content should link to main tag or similar"

This reverts commit ed82b95e.

core/modules/system/templates/page.html.twig

@@ -60,7 +60,8 @@
 
   {{ page.help }}
 
-  <main id="main-content" role="main" tabindex="-1">{# link is in html.html.twig #}
+  <main role="main">
+    <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     <div class="layout-content">
       {{ page.content }}

core/themes/bartik/templates/maintenance-page.html.twig

@@ -32,8 +32,9 @@
     </header>
     <div id="main-wrapper">
       <div id="main" class="clearfix">
-        <main id="content" class="column" role="main" tabindex="-1">
-          <section class="section" id="main-content">
+        <main id="content" class="column" role="main">
+          <section class="section">
+            <a id="main-content"></a>
             {% if title %}
               <h1 class="title" id="page-title">{{ title }}</h1>
             {% endif %}

core/themes/bartik/templates/page.html.twig

@@ -76,8 +76,9 @@
     <div id="main-wrapper" class="layout-main-wrapper layout-container clearfix">
       <div id="main" class="layout-main clearfix">
         {{ page.breadcrumb }}
-        <main id="content" class="column main-content" role="main" tabindex="-1">
-          <section class="section" id="main-content">
+        <main id="content" class="column main-content" role="main">
+          <section class="section">
+            <a id="main-content" tabindex="-1"></a>
             {{ page.content }}
           </section>
         </main>

core/themes/seven/templates/page.html.twig

@@ -48,7 +48,8 @@
   <div class="layout-container">
     {{ page.pre_content }}
     {{ page.breadcrumb }}
-    <main class="page-content clearfix" id="main-content" role="main" tabindex="-1">
+    <main class="page-content clearfix" role="main">
+      <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
       {{ page.highlighted }}
       {% if page.help %}
         <div class="help">