summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-02-16 01:41:21 (GMT)
committerxjm2017-02-16 01:41:21 (GMT)
commited82b95eb321e129133a1267ba4f7f927a2eeafa (patch)
tree89c05d785295537fdb79a1df1a544f9cc2a1d0e3
parent4b3ea1914bcd1a8c0ff0c7831d6135b7a2d0d0db (diff)
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
-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, 6 insertions, 10 deletions
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 032b724..f7524f8 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -60,8 +60,7 @@
{{ page.help }}
- <main role="main">
- <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
+ <main id="main-content" role="main" tabindex="-1">{# 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 3cd787b..2b17f62 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -32,9 +32,8 @@
</header>
<div id="main-wrapper">
<div id="main" class="clearfix">
- <main id="content" class="column" role="main">
- <section class="section">
- <a id="main-content"></a>
+ <main id="content" class="column" role="main" tabindex="-1">
+ <section class="section" id="main-content">
{% 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 023204f..046706a 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -76,9 +76,8 @@
<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">
- <section class="section">
- <a id="main-content" tabindex="-1"></a>
+ <main id="content" class="column main-content" role="main" tabindex="-1">
+ <section class="section" id="main-content">
{{ page.content }}
</section>
</main>
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index 1a1a89b..c66dc0b 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -48,8 +48,7 @@
<div class="layout-container">
{{ page.pre_content }}
{{ page.breadcrumb }}
- <main class="page-content clearfix" role="main">
- <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
+ <main class="page-content clearfix" id="main-content" role="main" tabindex="-1">
{{ page.highlighted }}
{% if page.help %}
<div class="help">