diff options
| author | Jacob Thornton <[email protected]> | 2013-08-07 23:10:11 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-08-07 23:10:11 -0700 |
| commit | 89b69ed77035eeb9c0034534d75fdb2062f10d47 (patch) | |
| tree | 99b1f65ee730de94e64b4992e5131f0432743b1e /_layouts | |
| parent | b35b65d0b3689f7999be998411e632046548af6e (diff) | |
| parent | f3104a3e3b04c2817094ef8ebd351833a4ade420 (diff) | |
| download | bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.tar.xz bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
_layouts/customize.html
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/customize.html | 3 | ||||
| -rw-r--r-- | _layouts/default.html | 9 | ||||
| -rw-r--r-- | _layouts/home.html | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/_layouts/customize.html b/_layouts/customize.html index f9d62cfa2..c04b6978d 100644 --- a/_layouts/customize.html +++ b/_layouts/customize.html @@ -6,12 +6,13 @@ <!-- Place anything custom after this. --> </head> <body data-spy="scroll" data-target=".bs-sidebar"> + <a class="sr-only" href="#content">Skip navigation</a> <!-- Docs master nav --> {% include nav-main.html %} <!-- Docs page layout --> - <div class="bs-header"> + <div class="bs-header" id="content" role="banner"> <div class="container"> <h1>{{ page.title }}</h1> <p>{{ page.lead }}</p> diff --git a/_layouts/default.html b/_layouts/default.html index 67b81b9e8..17431f91e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,12 +6,13 @@ <!-- Place anything custom after this. --> </head> <body> + <a class="sr-only" href="#content">Skip navigation</a> <!-- Docs master nav --> {% include nav-main.html %} <!-- Docs page layout --> - <div class="bs-header"> + <div class="bs-header" id="content" role="banner"> <div class="container"> <h1>{{ page.title }}</h1> <p>{{ page.lead }}</p> @@ -25,7 +26,7 @@ <div class="container bs-docs-container"> <div class="row"> <div class="col-lg-3"> - <div class="bs-sidebar"> + <div class="bs-sidebar" role="complementary"> <ul class="nav bs-sidenav"> {% if page.slug == "getting-started" %} {% include nav-getting-started.html %} @@ -41,7 +42,7 @@ </ul> </div> </div> - <div class="col-lg-9"> + <div class="col-lg-9" role="main"> {{ content }} </div> </div> @@ -50,7 +51,7 @@ <!-- Footer ================================================== --> - <footer class="bs-footer"> + <footer class="bs-footer" role="contentinfo"> {% include social-buttons.html %} <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> diff --git a/_layouts/home.html b/_layouts/home.html index 588533766..6beee6c54 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -6,6 +6,7 @@ <!-- Place anything custom after this. --> </head> <body class="bs-docs-home"> + <a class="sr-only" href="#content">Skip navigation</a> <!-- Docs master nav --> {% include nav-main.html %} @@ -16,7 +17,7 @@ <!-- Callout for the old docs link --> {% include old-bs-docs.html %} - <div class="container"> + <div class="container" role="contentinfo"> {% include social-buttons.html %} <ul class="bs-masthead-links"> |