From b188c0da8b51cd18d6fa3fa958e823a318ba5f10 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 16 Sep 2011 09:41:58 -0700
Subject: updated table styles a bit and floated the fluid columns to clear the
 row dropping problem we were having

---
 examples/fluid.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'examples')

diff --git a/examples/fluid.html b/examples/fluid.html
index f613b0ebb..ab4bb4367 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -71,9 +71,13 @@
       <div class="content">
         <!-- Main hero unit for a primary marketing message or call to action -->
         <div class="row">
-<div class="span4">a</div>
-<div class="span12">b</div>
-</div>
+          <div class="span4">a</div>
+          <div class="span12">b</div>
+        </div>
+        <div class="row">
+          <div class="span4">a</div>
+          <div class="span12">b</div>
+        </div>
         <!-- Example row of columns -->
         <div class="row">
           <div class="span6">
-- 
cgit v1.2.3


From e8d9eb264c3ba8c263d37259f65eece7247b00b9 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 16 Sep 2011 10:51:44 -0700
Subject: update alert message for ie7 to adjust dismiss icon, update example
 pages to clean up a few things from testing

---
 examples/container-app.html |  2 +-
 examples/fluid.html         | 32 ++++++++++++++++++++++++++------
 examples/hero.html          |  2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/examples/container-app.html b/examples/container-app.html
index 6432ecf0d..75328e645 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -78,7 +78,7 @@
     <div class="topbar">
       <div class="fill">
         <div class="container">
-          <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>
diff --git a/examples/fluid.html b/examples/fluid.html
index bef16804b..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,14 +70,33 @@
       </div>
       <div class="content">
         <!-- Main hero unit for a primary marketing message or call to action -->
-        <div class="row">
-          <div class="span4">a</div>
-          <div class="span12">b</div>
+        <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 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">
@@ -96,6 +115,7 @@
             <p><a class="btn" href="#">View details &raquo;</a></p>
           </div>
         </div>
+
         <footer>
           <p>&copy; Company 2011</p>
         </footer>
diff --git a/examples/hero.html b/examples/hero.html
index fab3d688b..6ded6e1e9 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -31,7 +31,7 @@
     <div class="topbar">
       <div class="fill">
         <div class="container">
-          <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>
-- 
cgit v1.2.3