1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00

Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip

Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html
This commit is contained in:
Mark Otto
2013-03-26 12:28:00 -07:00
5 changed files with 11 additions and 11 deletions

View File

@@ -369,7 +369,7 @@ $('#myModal').on('hidden', function () {
<div id="navbar-example" class="navbar navbar-static">
<div class="navbar-inner">
<div class="container" style="width: auto;">
<a class="brand" href="#">Project Name</a>
<a class="navbar-brand" href="#">Project Name</a>
<ul class="nav" role="navigation">
<li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>