mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch 'master' into derp

Browse Source 
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
This commit is contained in:
Mark Otto
2014-07-07 22:10:22 -07:00
parent fed2b0f7eb ddee04038f
commit 81b59d3536
230 changed files with 14222 additions and 5624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_layouts/default.html
+7 -4
View File
@@ -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 %}