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:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-07-09 22:19:23 -07:00
parent 216bc3d68b 643effe382
commit dae1a68fb1
25 changed files with 807 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/examples/jumbotron-narrow/index.html
+3 -3
View File
@@ -25,9 +25,9 @@
<div class="container">
<div class="header">
<ul class="nav nav-pills pull-right" role="tablist">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
<li role="presentation" class="active"><a href="#">Home</a></li>
<li role="presentation"><a href="#">About</a></li>
<li role="presentation"><a href="#">Contact</a></li>
</ul>
<h3 class="text-muted">Project name</h3>
</div>