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

Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Browse source 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
This commit is contained in:
Jacob Thornton 2011-09-02 21:04:25 -07:00
commit 0e13f8dca1
15 changed files with 1050 additions and 693 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/hero.html
View file

@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
@ -27,7 +27,7 @@
<div class="fill">
<div class="container">
<h3><a href="#">Project name</a></h3>
<ul>
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>