diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /_layouts | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/default.html | 5 | ||||
| -rw-r--r-- | _layouts/home.html | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 3f1276e4e..a2c26a22a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,10 +3,9 @@ <head> <!-- Meta, title, CSS, favicons, etc. --> {% include header.html %} - <!-- Place anything custom after this. --> </head> <body> - <a class="sr-only" href="#content">Skip navigation</a> + <a class="sr-only" href="#content">Skip to main content</a> <!-- Docs master nav --> {% include nav-main.html %} @@ -38,6 +37,8 @@ {% include nav-javascript.html %} {% elsif page.slug == "customize" %} {% include nav-customize.html %} + {% elsif page.slug == "about" %} + {% include nav-about.html %} {% endif %} </ul> </div> diff --git a/_layouts/home.html b/_layouts/home.html index cc5026cf8..c8328feb4 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -3,10 +3,9 @@ <head> <!-- Meta, title, CSS, favicons, etc. --> {% include header.html %} - <!-- Place anything custom after this. --> </head> <body class="bs-docs-home"> - <a class="sr-only" href="#content">Skip navigation</a> + <a class="sr-only" href="#content">Skip to main content</a> <!-- Docs master nav --> {% include nav-main.html %} @@ -15,6 +14,8 @@ {{ content }} <footer class="container" role="contentinfo"> + {% include ads.html %} + {% include social-buttons.html %} <ul class="bs-masthead-links"> @@ -31,9 +32,6 @@ <a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> </li> <li> - <a href="{{ page.base_url }}components/#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']);">Expo</a> </li> <li> |