rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
commit 954dcc0dc5
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/javascript.html
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>