kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

more tweaks to resolve some missed conflicts

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap-1.0.0.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 /* 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). * 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).

32
docs/index.html
View File

@ -900,9 +900,11 @@
<div class="page-header"> <div class="page-header">
<h1>Navigation</h1> <h1>Navigation</h1>
</div> </div>
<h2>Fixed topbar</h2> <h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar"> <div class="topbar">
<div class="fill">
<div class="container"> <div class="container">
<h3><a href="#">Project Name</a></h3> <h3><a href="#">Project Name</a></h3>
<ul> <ul>
@ -925,35 +927,11 @@
</ul> </ul>
</li> </li>
</ul> </ul>
=======
>>>>>>> .merge_file_ugVE3k
<div class="fill">
<div class="container fixed">
<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>
</div>
</div>
</div> </div>
</div> <!-- /fill -->
</div> <!-- /topbar -->
</div> <!-- topbar-wrapper --> </div> <!-- topbar-wrapper -->
<div class="row"> <div class="row">
<div class="span5 columns"> <div class="span5 columns">
<h4>What is it</h4> <h4>What is it</h4>