diff options
| author | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
| commit | a4c16155a21c7bcad9b1d52e2141425cdb7df494 (patch) | |
| tree | 490759c71a56d0b54fb46d5ae56851074a31a992 /docs/_layouts | |
| parent | 14651035deda4d02a1ca02c6088c34f770f897f6 (diff) | |
| parent | f3d857773455a940fca0c8d2ef1ca26982700031 (diff) | |
| download | bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.tar.xz bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
Diffstat (limited to 'docs/_layouts')
| -rw-r--r-- | docs/_layouts/customize.html | 25 | ||||
| -rw-r--r-- | docs/_layouts/default.html | 44 | ||||
| -rw-r--r-- | docs/_layouts/home.html | 3 |
3 files changed, 67 insertions, 5 deletions
diff --git a/docs/_layouts/customize.html b/docs/_layouts/customize.html new file mode 100644 index 000000000..f01f4f86e --- /dev/null +++ b/docs/_layouts/customize.html @@ -0,0 +1,25 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <!-- Meta, title, CSS, favicons, etc. --> + {% include header.html %} + <!-- Place anything custom after this. --> + </head> + <body> + + <!-- Docs master nav --> + {% include nav-main.html %} + + <!-- Docs page layout --> + <div class="container"> + {{ content }} + + <!-- Main docs footer (social buttons, copyright, etc). --> + {% include colophon.html %} + </div> + + <!-- JS and analytics only. --> + {% include footer.html %} + + </body> +</html> diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 8015c1587..249088b99 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -5,13 +5,47 @@ {% include header.html %} <!-- Place anything custom after this. --> </head> - <body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar"> + <body data-spy="scroll" data-target=".bs-sidebar"> - <!-- Docs nav --> - {% include docs-nav.html %} + <!-- Docs master nav --> + {% include nav-main.html %} - <!-- Page content of course! --> - {{ content }} + <!-- Docs page layout --> + <div class="bs-header"> + <div class="container"> + <h1>{{ page.title }}</h1> + <p>{{ page.lead }}</p> + </div> + </div> + + <div class="container bs-docs-container"> + <div class="row"> + <div class="col col-lg-3"> + <div class="bs-sidebar"> + <ul class="nav bs-sidenav"> + {% if page.slug == "getting-started" %} + {% include nav-getting-started.html %} + {% elsif page.slug == "css" %} + {% include nav-css.html %} + {% elsif page.slug == "components" %} + {% include nav-components.html %} + {% elsif page.slug == "js" %} + {% include nav-javascript.html %} + {% endif %} + </ul> + </div> + </div> + <div class="col col-lg-9"> + {{ content }} + </div> + </div> + + <!-- Quick back to top --> + <a href="#welcome" class="bs-top"> + Back to top + </a> + + </div> <!-- Main docs footer (social buttons, copyright, etc). --> {% include colophon.html %} diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html index 184936f38..9230184dc 100644 --- a/docs/_layouts/home.html +++ b/docs/_layouts/home.html @@ -7,6 +7,9 @@ </head> <body class="bs-docs-home"> + <!-- Docs master nav --> + {% include nav-main.html %} + <!-- Page content of course! --> {{ content }} |