mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 16:19:53 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Browse Source
This commit is contained in:
Mark Otto
2011-09-12 08:58:46 -07:00
parent 88f2f848b3 89465f8ce1
commit 6a5fb52bb1
7 changed files with 63 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/index.html
View File

@@ -37,7 +37,7 @@
<!-- Topbar
================================================== -->
<div class="topbar">
<div class="topbar" data-scrollspy="x" >
<div class="topbar-inner">
<div class="container">
<a class="brand" href="#">Bootstrap</a>
@@ -1262,7 +1262,7 @@
</div>
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar" data-dropdown>
<div class="topbar" data-dropdown="x" >
<div class="topbar-inner">
<div class="container">
<h3><a href="#">Project Name</a></h3>
@@ -1331,7 +1331,7 @@
<li><a href="#">Messages</a></li>
<li><a href="#">Settings</a></li>
<li><a href="#">Contact</a></li>
<li class="dropdown" data-dropdown>
<li class="dropdown" data-dropdown="x">
<a href="#" class="dropdown-toggle">Dropdown</a>
<ul class="dropdown-menu">
<li><a href="#">Secondary link</a></li>