Permalink
Browse files

more tweaks to resolve some missed conflicts

  • Loading branch information...
mdo committed Aug 22, 2011
1 parent 0df17f0 commit f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
Showing with 6 additions and 28 deletions.
  1. +1 −1 bootstrap-1.0.0.css
  2. +5 −27 docs/index.html
View
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Aug 21 20:53:42 PDT 2011
+ * Date: Sun Aug 21 20:55:56 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
View
@@ -900,35 +900,12 @@ <h4>Buttons</h4>
<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 @@ <h3><a href="#">Project Name</a></h3>
</li>
</ul>
</div>
- </div>
- </div>
+ </div> <!-- /fill -->
+ </div> <!-- /topbar -->
</div> <!-- topbar-wrapper -->
+
<div class="row">
<div class="span5 columns">
<h4>What is it</h4>

0 comments on commit f169c99

Please sign in to comment.