diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 11:49:41 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 11:49:41 -0700 |
| commit | db43777ddf2a72146621f385f54cba0d4103f80d (patch) | |
| tree | f6dc34a1873c0f66904ac92927ec1ef0b70d6330 /docs | |
| parent | 3f242bc70cde589d41dd7574e273e29511c317d2 (diff) | |
| parent | a4dc2c8955e0db79cc800f38d949db0ba0e7ba9a (diff) | |
| download | bootstrap-db43777ddf2a72146621f385f54cba0d4103f80d.tar.xz bootstrap-db43777ddf2a72146621f385f54cba0d4103f80d.zip | |
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/docs/index.html b/docs/index.html index 50a3b5715..e9686b90d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -945,47 +945,6 @@ </div><!-- /topbar --> </div><!-- /topbar-wrapper --> - - <div class="topbar-wrapper" style="z-index: 4;"> - <div class="topbar"> - <div class="fill"> - <div class="container"> - <h3><a href="#">Project Name</a></h3> - <ul class=""> - <li class="active"><a href="#">Home</a></li> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> - <li class="menu"> - <a href="#" class="menu">Dropdown</a> - <ul class="menu-dropdown"> - <li><a href="#">Secondary link</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Another link</a></li> - </ul> - </li> - </ul> - <form action=""> - <input type="text" placeholder="Search" /> - </form> - <ul class="secondary-nav"> - <li class="menu"> - <a href="#" class="menu">Dropdown</a> - <ul class="menu-dropdown"> - <li><a href="#">Secondary link</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Another link</a></li> - </ul> - </li> - </ul> - </div> - </div><!-- /topbar-inner --> - </div><!-- /topbar --> - </div><!-- /topbar-wrapper --> - - <div class="row"> <div class="span5 columns"> <h4>What is it</h4> |