rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
This commit is contained in:
Jacob Thornton 2011-09-02 00:32:09 -07:00
commit ec82b613d3
5 changed files with 67 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/index.html
View file

@ -34,7 +34,7 @@
<!-- Topbar
================================================== -->
<div class="topbar">
<div class="fill">
<div class="topbar-inner">
<div class="container">
<h3><a href="#">Bootstrap</a></h3>
<ul class="nav">
@ -908,7 +908,7 @@
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">
<div class="fill">
<div class="topbar-inner">
<div class="container">
<h3><a href="#">Project Name</a></h3>
<ul class="nav">
@ -941,7 +941,7 @@
</li>
</ul>
</div>
</div><!-- /fill -->
</div><!-- /topbar-inner -->
</div><!-- /topbar -->
</div><!-- /topbar-wrapper -->