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

1 files changed, 28 insertions, 4 deletions

diff --git a/examples/fluid.html b/examples/fluid.html
index 07012e5e9..eacb5c3d2 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -31,7 +31,7 @@
     <div class="topbar">
       <div class="topbar-inner">
         <div class="container-fluid">
-          <h3><a href="#">Project name</a></h3>
+          <a class="brand" href="#">Project name</a>
           <ul class="nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
@@ -70,10 +70,33 @@
       </div>
       <div class="content">
         <!-- Main hero unit for a primary marketing message or call to action -->
+        <div class="hero-unit">
+          <h1>Hello, world!</h1>
+          <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+          <p><a class="btn primary large">Learn more &raquo;</a></p>
+        </div>
+
+        <!-- Example row of columns -->
         <div class="row">
-<div class="span4">a</div>
-<div class="span12">b</div>
-</div>
+          <div class="span6">
+            <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">
+            <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">
+            <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>
+          </div>
+        </div>
+
+        <hr>
+
         <!-- Example row of columns -->
         <div class="row">
           <div class="span6">
@@ -92,6 +115,7 @@
             <p><a class="btn" href="#">View details &raquo;</a></p>
           </div>
         </div>
+
         <footer>
           <p>&copy; Company 2011</p>
         </footer>