diff options
| author | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
| commit | ef5d8e98e2e9aa87496eef8359667f7e052ae636 (patch) | |
| tree | 0d202235247562f094df841960170b1245ea728b /docs/_layouts | |
| parent | dc5917bedfda321b72310209d2807ea10347f7ed (diff) | |
| parent | e4d13e238d0d6ea241f4e77328f6551206d17362 (diff) | |
| download | bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.tar.xz bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.zip | |
Merge branch 'master' into sr-only-focusable
Conflicts:
dist/css/bootstrap.css
Diffstat (limited to 'docs/_layouts')
| -rw-r--r-- | docs/_layouts/default.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 17ef8abc7..70746f6cf 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" %} |