diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/_layouts | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/_layouts')
| -rw-r--r-- | docs/_layouts/default.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 3fbc10f8d..06de9e841 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -24,7 +24,7 @@ {{ content }} <!-- </div> --> <!-- <div class="col-md-3"> - <div class="bs-docs-sidebar hidden-print" role="complementary"> + <div class="bs-docs-sidebar hidden-print hidden-xs hidden-sm" role="complementary"> <ul class="nav bs-docs-sidenav"> {% if page.slug == "getting-started" %} {% include nav/getting-started.html %} @@ -45,11 +45,14 @@ <a class="back-to-top" href="#top"> Back to top </a> + {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} + <a href="#" class="bs-docs-theme-toggle"> + Preview theme + </a> + {% endif %} </div> </div> - --> - <!-- </div> --> - + </div> --> </div> {% include footer.html %} |