mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-03 02:13:01 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:twitter/bootstrap into dev

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less
This commit is contained in:
Jacob Thornton
2011-10-29 17:08:35 -07:00
parent 61937a803b d3b8a96589
commit 9a30b8c05d
13 changed files with 298 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/hero.html
View File

@@ -52,17 +52,17 @@
<!-- Example row of columns -->
<div class="row">
<div class="span6">
<div class="span-one-third">
<h2>Heading</h2>
<p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span5">
<div class="span-one-third">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span5">
<div class="span-one-third">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>