summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-02-21 09:44:27 (GMT)
committerxjm2017-02-21 09:44:27 (GMT)
commit0f8447855a074dc09d10a4ab4ab0f7df38631d0c (patch)
tree477a3f7d84a3fec0b27ab36cabeb5964e0fcb9a0
parentbbd96cc9a0ecbd671a40c8c027846bda0d8b2ab6 (diff)
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 ed82b95eb321e129133a1267ba4f7f927a2eeafa.
-rw-r--r--core/modules/system/templates/page.html.twig3
-rw-r--r--core/themes/bartik/templates/maintenance-page.html.twig5
-rw-r--r--core/themes/bartik/templates/page.html.twig5
-rw-r--r--core/themes/seven/templates/page.html.twig3
4 files changed, 10 insertions, 6 deletions
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index f7524f8..032b724 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/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 }}
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 2b17f62..3cd787b 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/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 %}
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 046706a..023204f 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/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>
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index c66dc0b..1a1a89b 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/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">