diff options
| author | Jacob Thornton <[email protected]> | 2011-09-01 22:54:59 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-01 22:54:59 -0700 |
| commit | 0159524413f7a90b90cff50fa07d07b85380845d (patch) | |
| tree | a05a627878a00e467dc4acfdef164ff89179aeef /docs | |
| parent | 72da5dd54d154bb2b87b0ec23107eca775c72f51 (diff) | |
| parent | 0cb6804b6953d8fce53fcfae065288fd826d1941 (diff) | |
| download | bootstrap-0159524413f7a90b90cff50fa07d07b85380845d.tar.xz bootstrap-0159524413f7a90b90cff50fa07d07b85380845d.zip | |
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
bootstrap-1.2.0.css
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/docs/index.html b/docs/index.html index 78a2b0333..62ca0b8f9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -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> @@ -237,6 +241,9 @@ <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> </div><!-- /row --> @@ -1092,7 +1099,7 @@ <div class="span12 columns"> <div class="alert-message warning"> <a class="close" href="#">×</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="#">×</a> @@ -1118,7 +1125,7 @@ <div class="span12 columns"> <div class="alert-message block-message warning"> <a class="close" href="#">×</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> |