diff options
| author | Mark Otto <[email protected]> | 2013-08-11 20:45:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-11 20:45:42 -0700 |
| commit | c52a3508c616da928622bdfc930e2e11741a65e2 (patch) | |
| tree | c9a001864815a7c62dff888aecf5de9b60015a1f /_includes | |
| parent | 2ae8be3b316137fe63f5979480bdb731ed2b8c24 (diff) | |
| parent | f47a1905e2847e528d982fbd454b2b8c8ce900bb (diff) | |
| download | bootstrap-c52a3508c616da928622bdfc930e2e11741a65e2.tar.xz bootstrap-c52a3508c616da928622bdfc930e2e11741a65e2.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 8 | ||||
| -rw-r--r-- | _includes/nav-main.html | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 83ff87e26..8898c02e8 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -9,6 +9,14 @@ <script src="{{ page.base_url }}assets/js/application.js"></script> +{% if page.slug == "customize" %} +<script src="{{ page.base_url }}assets/js/less.js"></script> +<script src="{{ page.base_url }}assets/js/jszip.js"></script> +<script src="{{ page.base_url }}assets/js/uglify.js"></script> +<script src="{{ page.base_url }}assets/js/jquery.bbq.min.js"></script> +<script src="{{ page.base_url }}assets/js/customizer.js"></script> +{% endif %} + <!-- Analytics ================================================== --> <script> diff --git a/_includes/nav-main.html b/_includes/nav-main.html index 1796893ed..1e15b0f32 100644 --- a/_includes/nav-main.html +++ b/_includes/nav-main.html @@ -1,4 +1,4 @@ -<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav role="banner""> +<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner"> <div class="container"> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> <span class="sr-only">Toggle navigation</span> |