diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
| commit | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch) | |
| tree | f11fa18c33d1a65ae4422dc3c352c34a2b323b8c /docs/_layouts | |
| parent | 41c782567775d3bbcfc62d163ae22a531277b5e2 (diff) | |
| parent | b352f98f325adbd994f01cb94f4d0a454783bbce (diff) | |
| download | bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'docs/_layouts')
| -rw-r--r-- | docs/_layouts/default.html | 6 | ||||
| -rw-r--r-- | docs/_layouts/example.html | 2 | ||||
| -rw-r--r-- | docs/_layouts/home.html | 17 |
3 files changed, 21 insertions, 4 deletions
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index acab46de9..8015c1587 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -5,10 +5,10 @@ {% include header.html %} <!-- Place anything custom after this. --> </head> - <body class="bs-docs-body" data-spy="scroll" data-target=".bs-docs-sidebar"> + <body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar"> - <!-- Main navbar for all docs pages. --> - {% include navbar.html %} + <!-- Docs nav --> + {% include docs-nav.html %} <!-- Page content of course! --> {{ content }} diff --git a/docs/_layouts/example.html b/docs/_layouts/example.html index 38510f13a..617fc8ab2 100644 --- a/docs/_layouts/example.html +++ b/docs/_layouts/example.html @@ -14,4 +14,4 @@ {% include footer.html %} </body> -</html>
\ No newline at end of file +</html> diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html new file mode 100644 index 000000000..184936f38 --- /dev/null +++ b/docs/_layouts/home.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <!-- Meta, title, CSS, favicons, etc. --> + {% include header.html %} + <!-- Place anything custom after this. --> + </head> + <body class="bs-docs-home"> + + <!-- Page content of course! --> + {{ content }} + + <!-- JS and analytics only. --> + {% include footer.html %} + + </body> +</html> |