mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 11:21:23 +02:00
Code Issues Releases Wiki Activity

more tweaks to resolve some missed conflicts

Browse Source
This commit is contained in:
Mark Otto
2011-08-21 20:56:06 -07:00
parent 0df17f06d8
commit f169c99f72
2 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
docs/index.html
View File

@@ -900,35 +900,12 @@
<div class="page-header">
<h1>Navigation</h1>
</div>
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">
<div class="container">
<h3><a href="#">Project Name</a></h3>
<ul>
<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>
</ul>
<form action="">
<input type="text" placeholder="Search" />
</form>
<ul class="nav 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>
=======
>>>>>>> .merge_file_ugVE3k
<div class="fill">
<div class="container fixed">
<div class="container">
<h3><a href="#">Project Name</a></h3>
<ul>
<li class="active"><a href="#">Home</a></li>
@@ -951,9 +928,10 @@
</li>
</ul>
</div>
</div>
</div>
</div> <!-- /fill -->
</div> <!-- /topbar -->
</div> <!-- topbar-wrapper -->
<div class="row">
<div class="span5 columns">
<h4>What is it</h4>