diff options
| author | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
| commit | 8551f42ae2935c96bd37ae8ed15198a0cc22ede2 (patch) | |
| tree | 77498aad62c25da55fb121470d91623c14873f58 /docs/_layouts | |
| parent | b36d19c3c6caf89fbe996678bdefe3f7e9a69281 (diff) | |
| parent | 2cef0af211e8b6780fff90fe5f110493585aa97c (diff) | |
| download | bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.tar.xz bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.zip | |
Merge branch 'master' into pr/12412
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'docs/_layouts')
| -rw-r--r-- | docs/_layouts/default.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index c69c4fd10..8dc51026e 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -11,7 +11,7 @@ {% include nav-main.html %} <!-- Docs page layout --> - <div class="bs-header" id="content"> + <div class="bs-docs-header" id="content"> <div class="container"> <h1>{{ page.title }}</h1> <p>{{ page.lead }}</p> @@ -26,8 +26,8 @@ {{ content }} </div> <div class="col-md-3"> - <div class="bs-sidebar hidden-print" role="complementary"> - <ul class="nav bs-sidenav"> + <div class="bs-docs-sidebar hidden-print" role="complementary"> + <ul class="nav bs-docs-sidenav"> {% if page.slug == "getting-started" %} {% include nav-getting-started.html %} {% elsif page.slug == "css" %} @@ -44,6 +44,9 @@ {% include nav-migration.html %} {% endif %} </ul> + <a class="back-to-top" href="#top"> + Back to top + </a> </div> </div> </div> |