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

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
This commit is contained in:
Mark Otto
2013-02-01 10:34:25 -08:00
parent 725cf7f6ec 7d655c3549
commit 2553d74b54
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/examples/sticky-footer-navbar.html
+2 -2
View File
@@ -93,11 +93,11 @@
<!-- Fixed navbar -->
<div class="navbar navbar-fixed-top">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</button>
<a class="brand" href="#">Project name</a>
<div class="nav-collapse collapse">
<ul class="nav">