diff options
| author | Mark Otto <[email protected]> | 2013-08-17 17:31:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 17:31:58 -0700 |
| commit | ba20e512ce53e7cc771ba06d492a01d48db6cc97 (patch) | |
| tree | 30cebcbb796725c7dc06c9125714d83adbf585c3 /_layouts | |
| parent | 2af9cf10ce2e93fe0ac07651d405abc484e4c608 (diff) | |
| parent | e29c23afab2577e05cfaa41f64a20f1ca87222fc (diff) | |
| download | bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.tar.xz bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.zip | |
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/customize.html | 51 | ||||
| -rw-r--r-- | _layouts/default.html | 11 | ||||
| -rw-r--r-- | _layouts/home.html | 9 |
3 files changed, 11 insertions, 60 deletions
diff --git a/_layouts/customize.html b/_layouts/customize.html deleted file mode 100644 index 28275c3e1..000000000 --- a/_layouts/customize.html +++ /dev/null @@ -1,51 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <!-- Meta, title, CSS, favicons, etc. --> - {% include header.html %} - <!-- Place anything custom after this. --> - </head> - <body data-spy="scroll" data-target=".bs-sidebar"> - - <!-- Docs master nav --> - {% include nav-main.html %} - - <!-- Docs page layout --> - <div class="bs-header"> - <div class="container"> - <h1>{{ page.title }}</h1> - <p>{{ page.lead }}</p> - {% include ads.html %} - </div> - </div> - - <!-- Callout for the old docs link --> - {% include old-bs-docs.html %} - - <div class="bs-customize-placeholder"> - <div class="container bs-docs-container"> - <p class="lead">Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the <a href="{{ site.repo }}/releases">compiled CSS and JavaScript</a>. Hang tight!</p> - </div> - </div> - - <!-- Footer - ================================================== --> - <footer class="bs-footer"> - {% 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> - <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> - <ul class="footer-links"> - <li><a href="{{ site.blog }}">Blog</a></li> - <li class="muted">·</li> - <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li> - <li class="muted">·</li> - <li><a href="{{ site.repo }}/releases">Releases</a></li> - </ul> - </footer> - - <!-- JS and analytics only. --> - {% include footer.html %} - - </body> -</html> diff --git a/_layouts/default.html b/_layouts/default.html index 67b81b9e8..c2ff9f808 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"> <div class="container"> <h1>{{ page.title }}</h1> <p>{{ page.lead }}</p> @@ -24,8 +25,8 @@ <div class="container bs-docs-container"> <div class="row"> - <div class="col-lg-3"> - <div class="bs-sidebar"> + <div class="col-md-3"> + <div class="bs-sidebar hidden-print" 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-md-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..d0ed1cfb1 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"> + <footer class="container" role="contentinfo"> {% include social-buttons.html %} <ul class="bs-masthead-links"> @@ -24,16 +25,16 @@ <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a> </li> <li> - <a href="{{ site.examples }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> + <a href="{{ page.base_url }}getting-started#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> </li> <li> <a href="{{ site.glyphicons }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a> </li> <li> - <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a> + <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a> </li> </ul> - </div> + </footer> <!-- JS and analytics only. --> {% include footer.html %} |