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

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

Browse Source 
Conflicts:
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton
2011-09-01 22:54:59 -07:00
parent 72da5dd54d 0cb6804b69
commit 0159524413
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docs/index.html
View File

@@ -215,6 +215,10 @@
<div class="span-one-third column">1/3</div>
<div class="span-one-third column">1/3</div>
</div><!-- /row -->
<div class="row show-grid" title="One-third and two-thirds layout">
<div class="span-one-third column">1/3</div>
<div class="span-two-thirds column">2/3</div>
</div><!-- /row -->
<div class="row show-grid" title="Irregular three column layout">
<div class="span4 columns">4</div>
<div class="span6 columns">6</div>
@@ -236,6 +240,9 @@
<div class="span4 columns">4</div>
<div class="span8 columns offset4">8 offset 4</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span-one-third columns offset-two-thirds">1/3 offset 2/3s</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span4 columns offset4">4 offset 4</div>
<div class="span4 columns offset4">4 offset 4</div>
@@ -1092,7 +1099,7 @@
<div class="span12 columns">
<div class="alert-message warning">
<a class="close" href="#">&times;</a>
<p><strong>Holy gaucamole!</strong> Best check yo self, you’re not looking too good.</p>
<p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
</div>
<div class="alert-message error">
<a class="close" href="#">&times;</a>
@@ -1118,7 +1125,7 @@
<div class="span12 columns">
<div class="alert-message block-message warning">
<a class="close" href="#">&times;</a>
<p><strong>Holy gaucamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
<p><strong>Holy guacamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
<div class="alert-actions">
<a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
</div>