mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

Browse Source 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
2012-07-23 23:01:38 -07:00
parent 0dda2c4659 614d52bd7f
commit f085dbadd1
44 changed files with 2494 additions and 1933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/base-css.html
+1 -1
View File
@@ -78,7 +78,6 @@
</div>
</header>
<div class="bs-docs-canvas">
<div class="container">
@@ -1798,6 +1797,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<script src="assets/js/bootstrap-collapse.js"></script>
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
<script src="assets/js/bootstrap-affix.js"></script>
<script src="assets/js/application.js"></script>