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

16 files changed, 373 insertions, 340 deletions

diff --git a/bootstrap.css b/bootstrap.css
index cc5d7f019..c7d457d6e 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 26 15:39:24 PST 2012
+ * Date: Thu Jan 26 19:09:35 PST 2012
  */
 article,
 aside,
@@ -1074,274 +1074,277 @@ table .span12 {
   width: 14px;
   height: 14px;
 }
-.glass {
+.icon.white {
+  background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+}
+.icon.glass {
   background-position: 0      0;
 }
-.music {
+.icon.music {
   background-position: -24px 0;
 }
-.search {
+.icon.search {
   background-position: -48px 0;
 }
-.envelope {
+.icon.envelope {
   background-position: -72px 0;
 }
-.heart {
+.icon.heart {
   background-position: -96px 0;
 }
-.star {
+.icon.star {
   background-position: -120px 0;
 }
-.star-empty {
+.icon.star-empty {
   background-position: -144px 0;
 }
-.user {
+.icon.user {
   background-position: -168px 0;
 }
-.film {
+.icon.film {
   background-position: -192px 0;
 }
-.th-large {
+.icon.th-large {
   background-position: -216px 0;
 }
-.th {
+.icon.th {
   background-position: -240px 0;
 }
-.th-list {
+.icon.th-list {
   background-position: -264px 0;
 }
-.ok {
+.icon.ok {
   background-position: -288px 0;
 }
-.remove {
+.icon.remove {
   background-position: -312px 0;
 }
-.zoom-in {
+.icon.zoom-in {
   background-position: -336px 0;
 }
-.zoom-out {
+.icon.zoom-out {
   background-position: -360px 0;
 }
-.off {
+.icon.off {
   background-position: -384px 0;
 }
-.signal {
+.icon.signal {
   background-position: -408px 0;
 }
-.cog {
+.icon.cog {
   background-position: -432px 0;
 }
-.trash {
+.icon.trash {
   background-position: -456px 0;
 }
-.home {
+.icon.home {
   background-position: 0 -24px;
 }
-.file {
+.icon.file {
   background-position: -24px -24px;
 }
-.time {
+.icon.time {
   background-position: -48px -24px;
 }
-.road {
+.icon.road {
   background-position: -72px -24px;
 }
-.download-alt {
+.icon.download-alt {
   background-position: -96px -24px;
 }
-.download {
+.icon.download {
   background-position: -120px -24px;
 }
-.upload {
+.icon.upload {
   background-position: -144px -24px;
 }
-.inbox {
+.icon.inbox {
   background-position: -168px -24px;
 }
-.play-circle {
+.icon.play-circle {
   background-position: -192px -24px;
 }
-.repeat {
+.icon.repeat {
   background-position: -216px -24px;
 }
-.refresh {
+.icon.refresh {
   background-position: -240px -24px;
 }
-.calendar {
+.icon.calendar {
   background-position: -264px -24px;
 }
-.lock {
+.icon.lock {
   background-position: -288px -24px;
 }
-.flag {
+.icon.flag {
   background-position: -312px -24px;
 }
-.headphones {
+.icon.headphones {
   background-position: -336px -24px;
 }
-.volume-off {
+.icon.volume-off {
   background-position: -360px -24px;
 }
-.volume-down {
+.icon.volume-down {
   background-position: -384px -24px;
 }
-.volume-up {
+.icon.volume-up {
   background-position: -408px -24px;
 }
-.qrcode {
+.icon.qrcode {
   background-position: -432px -24px;
 }
-.barcode {
+.icon.barcode {
   background-position: -456px -24px;
 }
-.tag {
+.icon.tag {
   background-position: 0 -48px;
 }
-.tags {
+.icon.tags {
   background-position: -24px -48px;
 }
-.book {
+.icon.book {
   background-position: -48px -48px;
 }
-.bookmark {
+.icon.bookmark {
   background-position: -72px -48px;
 }
-.print {
+.icon.print {
   background-position: -96px -48px;
 }
-.camera {
+.icon.camera {
   background-position: -120px -48px;
 }
-.font {
+.icon.font {
   background-position: -144px -48px;
 }
-.bold {
+.icon.bold {
   background-position: -168px -48px;
 }
-.italic {
+.icon.italic {
   background-position: -192px -48px;
 }
-.text-height {
+.icon.text-height {
   background-position: -216px -48px;
 }
-.text-width {
+.icon.text-width {
   background-position: -240px -48px;
 }
-.align-left {
+.icon.align-left {
   background-position: -264px -48px;
 }
-.align-center {
+.icon.align-center {
   background-position: -288px -48px;
 }
-.align-right {
+.icon.align-right {
   background-position: -312px -48px;
 }
-.align-justify {
+.icon.align-justify {
   background-position: -336px -48px;
 }
-.list {
+.icon.list {
   background-position: -360px -48px;
 }
-.indent-left {
+.icon.indent-left {
   background-position: -384px -48px;
 }
-.indent-right {
+.icon.indent-right {
   background-position: -408px -48px;
 }
-.facetime-video {
+.icon.facetime-video {
   background-position: -432px -48px;
 }
-.picture {
+.icon.picture {
   background-position: -456px -48px;
 }
-.pencil {
+.icon.pencil {
   background-position: 0 -72px;
 }
-.map-marker {
+.icon.map-marker {
   background-position: -24px -72px;
 }
-.adjust {
+.icon.adjust {
   background-position: -48px -72px;
 }
-.tint {
+.icon.tint {
   background-position: -72px -72px;
 }
-.edit {
+.icon.edit {
   background-position: -96px -72px;
 }
-.share {
+.icon.share {
   background-position: -120px -72px;
 }
-.check {
+.icon.check {
   background-position: -144px -72px;
 }
-.move {
+.icon.move {
   background-position: -168px -72px;
 }
-.step-backward {
+.icon.step-backward {
   background-position: -192px -72px;
 }
-.fast-backward {
+.icon.fast-backward {
   background-position: -216px -72px;
 }
-.backward {
+.icon.backward {
   background-position: -240px -72px;
 }
-.play {
+.icon.play {
   background-position: -264px -72px;
 }
-.pause {
+.icon.pause {
   background-position: -288px -72px;
 }
-.stop {
+.icon.stop {
   background-position: -312px -72px;
 }
-.forward {
+.icon.forward {
   background-position: -336px -72px;
 }
-.fast-forward {
+.icon.fast-forward {
   background-position: -360px -72px;
 }
-.step-forward {
+.icon.step-forward {
   background-position: -384px -72px;
 }
-.eject {
+.icon.eject {
   background-position: -408px -72px;
 }
-.chevron-left {
+.icon.chevron-left {
   background-position: -432px -72px;
 }
-.chevron-right {
+.icon.chevron-right {
   background-position: -456px -72px;
 }
-.arrow-left {
+.icon.arrow-left {
   background-position: -240px -96px;
 }
-.arrow-right {
+.icon.arrow-right {
   background-position: -264px -96px;
 }
-.arrow-up {
+.icon.arrow-up {
   background-position: -288px -96px;
 }
-.arrow-down {
+.icon.arrow-down {
   background-position: -312px -96px;
 }
-.share-alt {
+.icon.share-alt {
   background-position: -336px -96px;
 }
-.resize-full {
+.icon.resize-full {
   background-position: -360px -96px;
 }
-.resize-small {
+.icon.resize-small {
   background-position: -384px -96px;
 }
-.plus {
+.icon.plus {
   background-position: -408px -96px;
 }
-.minus {
+.icon.minus {
   background-position: -432px -96px;
 }
-.asterisk {
+.icon.asterisk {
   background-position: -456px -96px;
 }
 .dropdown {
@@ -2998,6 +3001,25 @@ a.thumbnail:hover {
 .carousel-caption h4, .carousel-caption p {
   color: #ffffff;
 }
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
 .pull-right {
   float: right;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1e41bf911..846a935b8 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -208,96 +208,97 @@ table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
 .icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
-.glass{background-position:0 0;}
-.music{background-position:-24px 0;}
-.search{background-position:-48px 0;}
-.envelope{background-position:-72px 0;}
-.heart{background-position:-96px 0;}
-.star{background-position:-120px 0;}
-.star-empty{background-position:-144px 0;}
-.user{background-position:-168px 0;}
-.film{background-position:-192px 0;}
-.th-large{background-position:-216px 0;}
-.th{background-position:-240px 0;}
-.th-list{background-position:-264px 0;}
-.ok{background-position:-288px 0;}
-.remove{background-position:-312px 0;}
-.zoom-in{background-position:-336px 0;}
-.zoom-out{background-position:-360px 0;}
-.off{background-position:-384px 0;}
-.signal{background-position:-408px 0;}
-.cog{background-position:-432px 0;}
-.trash{background-position:-456px 0;}
-.home{background-position:0 -24px;}
-.file{background-position:-24px -24px;}
-.time{background-position:-48px -24px;}
-.road{background-position:-72px -24px;}
-.download-alt{background-position:-96px -24px;}
-.download{background-position:-120px -24px;}
-.upload{background-position:-144px -24px;}
-.inbox{background-position:-168px -24px;}
-.play-circle{background-position:-192px -24px;}
-.repeat{background-position:-216px -24px;}
-.refresh{background-position:-240px -24px;}
-.calendar{background-position:-264px -24px;}
-.lock{background-position:-288px -24px;}
-.flag{background-position:-312px -24px;}
-.headphones{background-position:-336px -24px;}
-.volume-off{background-position:-360px -24px;}
-.volume-down{background-position:-384px -24px;}
-.volume-up{background-position:-408px -24px;}
-.qrcode{background-position:-432px -24px;}
-.barcode{background-position:-456px -24px;}
-.tag{background-position:0 -48px;}
-.tags{background-position:-24px -48px;}
-.book{background-position:-48px -48px;}
-.bookmark{background-position:-72px -48px;}
-.print{background-position:-96px -48px;}
-.camera{background-position:-120px -48px;}
-.font{background-position:-144px -48px;}
-.bold{background-position:-168px -48px;}
-.italic{background-position:-192px -48px;}
-.text-height{background-position:-216px -48px;}
-.text-width{background-position:-240px -48px;}
-.align-left{background-position:-264px -48px;}
-.align-center{background-position:-288px -48px;}
-.align-right{background-position:-312px -48px;}
-.align-justify{background-position:-336px -48px;}
-.list{background-position:-360px -48px;}
-.indent-left{background-position:-384px -48px;}
-.indent-right{background-position:-408px -48px;}
-.facetime-video{background-position:-432px -48px;}
-.picture{background-position:-456px -48px;}
-.pencil{background-position:0 -72px;}
-.map-marker{background-position:-24px -72px;}
-.adjust{background-position:-48px -72px;}
-.tint{background-position:-72px -72px;}
-.edit{background-position:-96px -72px;}
-.share{background-position:-120px -72px;}
-.check{background-position:-144px -72px;}
-.move{background-position:-168px -72px;}
-.step-backward{background-position:-192px -72px;}
-.fast-backward{background-position:-216px -72px;}
-.backward{background-position:-240px -72px;}
-.play{background-position:-264px -72px;}
-.pause{background-position:-288px -72px;}
-.stop{background-position:-312px -72px;}
-.forward{background-position:-336px -72px;}
-.fast-forward{background-position:-360px -72px;}
-.step-forward{background-position:-384px -72px;}
-.eject{background-position:-408px -72px;}
-.chevron-left{background-position:-432px -72px;}
-.chevron-right{background-position:-456px -72px;}
-.arrow-left{background-position:-240px -96px;}
-.arrow-right{background-position:-264px -96px;}
-.arrow-up{background-position:-288px -96px;}
-.arrow-down{background-position:-312px -96px;}
-.share-alt{background-position:-336px -96px;}
-.resize-full{background-position:-360px -96px;}
-.resize-small{background-position:-384px -96px;}
-.plus{background-position:-408px -96px;}
-.minus{background-position:-432px -96px;}
-.asterisk{background-position:-456px -96px;}
+.icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);}
+.icon.glass{background-position:0 0;}
+.icon.music{background-position:-24px 0;}
+.icon.search{background-position:-48px 0;}
+.icon.envelope{background-position:-72px 0;}
+.icon.heart{background-position:-96px 0;}
+.icon.star{background-position:-120px 0;}
+.icon.star-empty{background-position:-144px 0;}
+.icon.user{background-position:-168px 0;}
+.icon.film{background-position:-192px 0;}
+.icon.th-large{background-position:-216px 0;}
+.icon.th{background-position:-240px 0;}
+.icon.th-list{background-position:-264px 0;}
+.icon.ok{background-position:-288px 0;}
+.icon.remove{background-position:-312px 0;}
+.icon.zoom-in{background-position:-336px 0;}
+.icon.zoom-out{background-position:-360px 0;}
+.icon.off{background-position:-384px 0;}
+.icon.signal{background-position:-408px 0;}
+.icon.cog{background-position:-432px 0;}
+.icon.trash{background-position:-456px 0;}
+.icon.home{background-position:0 -24px;}
+.icon.file{background-position:-24px -24px;}
+.icon.time{background-position:-48px -24px;}
+.icon.road{background-position:-72px -24px;}
+.icon.download-alt{background-position:-96px -24px;}
+.icon.download{background-position:-120px -24px;}
+.icon.upload{background-position:-144px -24px;}
+.icon.inbox{background-position:-168px -24px;}
+.icon.play-circle{background-position:-192px -24px;}
+.icon.repeat{background-position:-216px -24px;}
+.icon.refresh{background-position:-240px -24px;}
+.icon.calendar{background-position:-264px -24px;}
+.icon.lock{background-position:-288px -24px;}
+.icon.flag{background-position:-312px -24px;}
+.icon.headphones{background-position:-336px -24px;}
+.icon.volume-off{background-position:-360px -24px;}
+.icon.volume-down{background-position:-384px -24px;}
+.icon.volume-up{background-position:-408px -24px;}
+.icon.qrcode{background-position:-432px -24px;}
+.icon.barcode{background-position:-456px -24px;}
+.icon.tag{background-position:0 -48px;}
+.icon.tags{background-position:-24px -48px;}
+.icon.book{background-position:-48px -48px;}
+.icon.bookmark{background-position:-72px -48px;}
+.icon.print{background-position:-96px -48px;}
+.icon.camera{background-position:-120px -48px;}
+.icon.font{background-position:-144px -48px;}
+.icon.bold{background-position:-168px -48px;}
+.icon.italic{background-position:-192px -48px;}
+.icon.text-height{background-position:-216px -48px;}
+.icon.text-width{background-position:-240px -48px;}
+.icon.align-left{background-position:-264px -48px;}
+.icon.align-center{background-position:-288px -48px;}
+.icon.align-right{background-position:-312px -48px;}
+.icon.align-justify{background-position:-336px -48px;}
+.icon.list{background-position:-360px -48px;}
+.icon.indent-left{background-position:-384px -48px;}
+.icon.indent-right{background-position:-408px -48px;}
+.icon.facetime-video{background-position:-432px -48px;}
+.icon.picture{background-position:-456px -48px;}
+.icon.pencil{background-position:0 -72px;}
+.icon.map-marker{background-position:-24px -72px;}
+.icon.adjust{background-position:-48px -72px;}
+.icon.tint{background-position:-72px -72px;}
+.icon.edit{background-position:-96px -72px;}
+.icon.share{background-position:-120px -72px;}
+.icon.check{background-position:-144px -72px;}
+.icon.move{background-position:-168px -72px;}
+.icon.step-backward{background-position:-192px -72px;}
+.icon.fast-backward{background-position:-216px -72px;}
+.icon.backward{background-position:-240px -72px;}
+.icon.play{background-position:-264px -72px;}
+.icon.pause{background-position:-288px -72px;}
+.icon.stop{background-position:-312px -72px;}
+.icon.forward{background-position:-336px -72px;}
+.icon.fast-forward{background-position:-360px -72px;}
+.icon.step-forward{background-position:-384px -72px;}
+.icon.eject{background-position:-408px -72px;}
+.icon.chevron-left{background-position:-432px -72px;}
+.icon.chevron-right{background-position:-456px -72px;}
+.icon.arrow-left{background-position:-240px -96px;}
+.icon.arrow-right{background-position:-264px -96px;}
+.icon.arrow-up{background-position:-288px -96px;}
+.icon.arrow-down{background-position:-312px -96px;}
+.icon.share-alt{background-position:-336px -96px;}
+.icon.resize-full{background-position:-360px -96px;}
+.icon.resize-small{background-position:-384px -96px;}
+.icon.plus{background-position:-408px -96px;}
+.icon.minus{background-position:-432px -96px;}
+.icon.asterisk{background-position:-456px -96px;}
 .dropdown{position:relative;}
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
@@ -546,6 +547,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
 .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
 .carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
 .pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2ef413906..6fa20cf4d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -538,6 +538,7 @@ hr.soften {
   padding: 19px 24px;
   margin-bottom: 27px;
   font-size: 30px;
+  line-height: 1;
   text-align: center;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 000000000..a92b1913a
--- /dev/null
+++ b/docs/assets/img/glyphicons-halflings-sprite-white.png
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
index 2d783eefe..b4e0acfbc 100644
--- a/docs/assets/img/glyphicons-halflings-sprite.png
+++ b/docs/assets/img/glyphicons-halflings-sprite.png
diff --git a/docs/base-css.html b/docs/base-css.html
index 239b963c4..a30e0c1f3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1482,7 +1482,7 @@
       <p>Or, use them in navigation.</p>
       <div class="well" style="padding: 8px 0;">
         <ul class="nav list">
-          <li class="active"><a href="#"><i class="icon home"></i> Home</a></li>
+          <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li>
           <li><a href="#"><i class="icon book"></i> Library</a></li>
           <li><a href="#"><i class="icon pencil"></i> Applications</a></li>
         </ul>
diff --git a/docs/index.html b/docs/index.html
index d7a870e8d..e60e9d711 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -114,28 +114,6 @@
         <hr class="soften">
 
         <div class="marketing">
-          <h1>Built with Bootstrap.</h1>
-          <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
-          <ul class="thumbnails example-sites">
-            <li class="span4">
-              <a class="thumbnail" href="http://kippt.com/" target="_blank">
-                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
-                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
-                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
-              </a>
-            </li>
-          </ul>
-
-        <hr class="soften">
-
           <h1>Designed for everyone, everywhere.</h1>
           <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
           <div class="row">
@@ -212,7 +190,29 @@
             </div>
           </div><!--/row-->
 
-        <hr class="soften">
+          <hr class="soften">
+
+          <h1>Built with Bootstrap.</h1>
+          <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
+          <ul class="thumbnails example-sites">
+            <li class="span4">
+              <a class="thumbnail" href="http://kippt.com/" target="_blank">
+                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
+                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
+                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
+              </a>
+            </li>
+          </ul>
+
+          <hr class="soften">
 
           <!-- Quickstart options
           ================================================== -->
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 11f3b4486..df6ea9f00 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -357,7 +357,7 @@
     <div class="span5">
       <p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p>
       <ol>
-        <li>Use the compiled responsive version, bootstrap-reponsive.css</li>
+        <li>Use the compiled responsive version, bootstrap-responsive.css</li>
         <li>Add @import "responsive.less" and recompile Bootstrap</li>
         <li>Modify and recompile responsive.less as a separate</li>
       </ol>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 6f928dfa3..c3d10eb08 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1417,7 +1417,7 @@
       <p>{{_i}}Or, use them in navigation.{{/i}}</p>
       <div class="well" style="padding: 8px 0;">
         <ul class="nav list">
-          <li class="active"><a href="#"><i class="icon home"></i> {{_i}}Home{{/i}}</a></li>
+          <li class="active"><a href="#"><i class="icon white home"></i> {{_i}}Home{{/i}}</a></li>
           <li><a href="#"><i class="icon book"></i> {{_i}}Library{{/i}}</a></li>
           <li><a href="#"><i class="icon pencil"></i> {{_i}}Applications{{/i}}</a></li>
         </ul>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index b045cc579..9a5421bd3 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -49,28 +49,6 @@
         <hr class="soften">
 
         <div class="marketing">
-          <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
-          <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
-          <ul class="thumbnails example-sites">
-            <li class="span4">
-              <a class="thumbnail" href="http://kippt.com/" target="_blank">
-                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
-                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
-                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
-              </a>
-            </li>
-          </ul>
-
-        <hr class="soften">
-
           <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
           <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
           <div class="row">
@@ -147,7 +125,29 @@
             </div>
           </div><!--/row-->
 
-        <hr class="soften">
+          <hr class="soften">
+
+          <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
+          <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
+          <ul class="thumbnails example-sites">
+            <li class="span4">
+              <a class="thumbnail" href="http://kippt.com/" target="_blank">
+                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
+                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
+                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
+              </a>
+            </li>
+          </ul>
+
+          <hr class="soften">
 
           <!-- Quickstart options
           ================================================== -->
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index bc924e3ef..7781e86f6 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -292,7 +292,7 @@
     <div class="span5">
       <p>{{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}</p>
       <ol>
-        <li>{{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}</li>
+        <li>{{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}</li>
         <li>{{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}</li>
         <li>{{_i}}Modify and recompile responsive.less as a separate{{/i}}</li>
       </ol>
@@ -314,4 +314,4 @@
 </pre>
     </div>
   </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index fad28ea46..1205a99ca 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -79,7 +79,7 @@
 
       q = this.query.toLowerCase()
 
-      items = this.data.filter(function (item) {
+      items = jQuery.grep(this.data, function (item) {
         if (that.matcher(item, q)) return item
       })
 
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index ede31c035..bc9f84373 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -57,6 +57,7 @@
 @import "progress-bars.less";
 @import "accordion.less";
 @import "carousel.less";
+@import "hero-unit.less";
 
 // Utility classes
 @import "utilities.less"; // Has to be last to override when necessary
diff --git a/lib/hero-unit.less b/lib/hero-unit.less
new file mode 100644
index 000000000..cba1cc46c
--- /dev/null
+++ b/lib/hero-unit.less
@@ -0,0 +1,20 @@
+// HERO UNIT
+// ---------
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  .border-radius(6px);
+  h1 {
+    margin-bottom: 0;
+    font-size: 60px;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+  p {
+    font-size: 18px;
+    font-weight: 200;
+    line-height: @baseLineHeight * 1.5;
+  }
+}
diff --git a/lib/patterns.less b/lib/patterns.less
index 7a039ce26..d94b921e4 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -6,23 +6,6 @@
 // PAGE HEADERS
 // ------------
 
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #f5f5f5;
-  .border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-  p {
-    font-size: 18px;
-    font-weight: 200;
-    line-height: @baseLineHeight * 1.5;
-  }
-}
 footer {
   padding-top: @baseLineHeight - 1;
   margin-top: @baseLineHeight - 1;
diff --git a/lib/sprites.less b/lib/sprites.less
index 0d51125c2..ef9295288 100644
--- a/lib/sprites.less
+++ b/lib/sprites.less
@@ -20,99 +20,102 @@
   width: 14px;
   height: 14px;
 }
+.icon.white {
+  background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+}
 
-.glass              { background-position: 0      0; }
-.music              { background-position: -24px  0; }
-.search             { background-position: -48px  0; }
-.envelope           { background-position: -72px  0; }
-.heart              { background-position: -96px  0; }
-.star               { background-position: -120px 0; }
-.star-empty         { background-position: -144px 0; }
-.user               { background-position: -168px 0; }
-.film               { background-position: -192px 0; }
-.th-large           { background-position: -216px 0; }
-.th                 { background-position: -240px 0; }
-.th-list            { background-position: -264px 0; }
-.ok                 { background-position: -288px 0; }
-.remove             { background-position: -312px 0; }
-.zoom-in            { background-position: -336px 0; }
-.zoom-out           { background-position: -360px 0; }
-.off                { background-position: -384px 0; }
-.signal             { background-position: -408px 0; }
-.cog                { background-position: -432px 0; }
-.trash              { background-position: -456px 0; }
+.icon.glass              { background-position: 0      0; }
+.icon.music              { background-position: -24px  0; }
+.icon.search             { background-position: -48px  0; }
+.icon.envelope           { background-position: -72px  0; }
+.icon.heart              { background-position: -96px  0; }
+.icon.star               { background-position: -120px 0; }
+.icon.star-empty         { background-position: -144px 0; }
+.icon.user               { background-position: -168px 0; }
+.icon.film               { background-position: -192px 0; }
+.icon.th-large           { background-position: -216px 0; }
+.icon.th                 { background-position: -240px 0; }
+.icon.th-list            { background-position: -264px 0; }
+.icon.ok                 { background-position: -288px 0; }
+.icon.remove             { background-position: -312px 0; }
+.icon.zoom-in            { background-position: -336px 0; }
+.icon.zoom-out           { background-position: -360px 0; }
+.icon.off                { background-position: -384px 0; }
+.icon.signal             { background-position: -408px 0; }
+.icon.cog                { background-position: -432px 0; }
+.icon.trash              { background-position: -456px 0; }
 
-.home               { background-position: 0      -24px; }
-.file               { background-position: -24px  -24px; }
-.time               { background-position: -48px  -24px; }
-.road               { background-position: -72px  -24px; }
-.download-alt       { background-position: -96px  -24px; }
-.download           { background-position: -120px -24px; }
-.upload             { background-position: -144px -24px; }
-.inbox              { background-position: -168px -24px; }
-.play-circle        { background-position: -192px -24px; }
-.repeat             { background-position: -216px -24px; }
-.refresh            { background-position: -240px -24px; }
-.calendar           { background-position: -264px -24px; }
-.lock               { background-position: -288px -24px; }
-.flag               { background-position: -312px -24px; }
-.headphones         { background-position: -336px -24px; }
-.volume-off         { background-position: -360px -24px; }
-.volume-down        { background-position: -384px -24px; }
-.volume-up          { background-position: -408px -24px; }
-.qrcode             { background-position: -432px -24px; }
-.barcode            { background-position: -456px -24px; }
+.icon.home               { background-position: 0      -24px; }
+.icon.file               { background-position: -24px  -24px; }
+.icon.time               { background-position: -48px  -24px; }
+.icon.road               { background-position: -72px  -24px; }
+.icon.download-alt       { background-position: -96px  -24px; }
+.icon.download           { background-position: -120px -24px; }
+.icon.upload             { background-position: -144px -24px; }
+.icon.inbox              { background-position: -168px -24px; }
+.icon.play-circle        { background-position: -192px -24px; }
+.icon.repeat             { background-position: -216px -24px; }
+.icon.refresh            { background-position: -240px -24px; }
+.icon.calendar           { background-position: -264px -24px; }
+.icon.lock               { background-position: -288px -24px; }
+.icon.flag               { background-position: -312px -24px; }
+.icon.headphones         { background-position: -336px -24px; }
+.icon.volume-off         { background-position: -360px -24px; }
+.icon.volume-down        { background-position: -384px -24px; }
+.icon.volume-up          { background-position: -408px -24px; }
+.icon.qrcode             { background-position: -432px -24px; }
+.icon.barcode            { background-position: -456px -24px; }
 
-.tag                { background-position: 0      -48px; }
-.tags               { background-position: -24px  -48px; }
-.book               { background-position: -48px  -48px; }
-.bookmark           { background-position: -72px  -48px; }
-.print              { background-position: -96px  -48px; }
-.camera             { background-position: -120px -48px; }
-.font               { background-position: -144px -48px; }
-.bold               { background-position: -168px -48px; }
-.italic             { background-position: -192px -48px; }
-.text-height        { background-position: -216px -48px; }
-.text-width         { background-position: -240px -48px; }
-.align-left         { background-position: -264px -48px; }
-.align-center       { background-position: -288px -48px; }
-.align-right        { background-position: -312px -48px; }
-.align-justify      { background-position: -336px -48px; }
-.list               { background-position: -360px -48px; }
-.indent-left        { background-position: -384px -48px; }
-.indent-right       { background-position: -408px -48px; }
-.facetime-video     { background-position: -432px -48px; }
-.picture            { background-position: -456px -48px; }
+.icon.tag                { background-position: 0      -48px; }
+.icon.tags               { background-position: -24px  -48px; }
+.icon.book               { background-position: -48px  -48px; }
+.icon.bookmark           { background-position: -72px  -48px; }
+.icon.print              { background-position: -96px  -48px; }
+.icon.camera             { background-position: -120px -48px; }
+.icon.font               { background-position: -144px -48px; }
+.icon.bold               { background-position: -168px -48px; }
+.icon.italic             { background-position: -192px -48px; }
+.icon.text-height        { background-position: -216px -48px; }
+.icon.text-width         { background-position: -240px -48px; }
+.icon.align-left         { background-position: -264px -48px; }
+.icon.align-center       { background-position: -288px -48px; }
+.icon.align-right        { background-position: -312px -48px; }
+.icon.align-justify      { background-position: -336px -48px; }
+.icon.list               { background-position: -360px -48px; }
+.icon.indent-left        { background-position: -384px -48px; }
+.icon.indent-right       { background-position: -408px -48px; }
+.icon.facetime-video     { background-position: -432px -48px; }
+.icon.picture            { background-position: -456px -48px; }
 
-.pencil             { background-position: 0      -72px; }
-.map-marker         { background-position: -24px  -72px; }
-.adjust             { background-position: -48px  -72px; }
-.tint               { background-position: -72px  -72px; }
-.edit               { background-position: -96px  -72px; }
-.share              { background-position: -120px -72px; }
-.check              { background-position: -144px -72px; }
-.move               { background-position: -168px -72px; }
-.step-backward      { background-position: -192px -72px; }
-.fast-backward      { background-position: -216px -72px; }
-.backward           { background-position: -240px -72px; }
-.play               { background-position: -264px -72px; }
-.pause              { background-position: -288px -72px; }
-.stop               { background-position: -312px -72px; }
-.forward            { background-position: -336px -72px; }
-.fast-forward       { background-position: -360px -72px; }
-.step-forward       { background-position: -384px -72px; }
-.eject              { background-position: -408px -72px; }
-.chevron-left       { background-position: -432px -72px; }
-.chevron-right      { background-position: -456px -72px; }
+.icon.pencil             { background-position: 0      -72px; }
+.icon.map-marker         { background-position: -24px  -72px; }
+.icon.adjust             { background-position: -48px  -72px; }
+.icon.tint               { background-position: -72px  -72px; }
+.icon.edit               { background-position: -96px  -72px; }
+.icon.share              { background-position: -120px -72px; }
+.icon.check              { background-position: -144px -72px; }
+.icon.move               { background-position: -168px -72px; }
+.icon.step-backward      { background-position: -192px -72px; }
+.icon.fast-backward      { background-position: -216px -72px; }
+.icon.backward           { background-position: -240px -72px; }
+.icon.play               { background-position: -264px -72px; }
+.icon.pause              { background-position: -288px -72px; }
+.icon.stop               { background-position: -312px -72px; }
+.icon.forward            { background-position: -336px -72px; }
+.icon.fast-forward       { background-position: -360px -72px; }
+.icon.step-forward       { background-position: -384px -72px; }
+.icon.eject              { background-position: -408px -72px; }
+.icon.chevron-left       { background-position: -432px -72px; }
+.icon.chevron-right      { background-position: -456px -72px; }
 
-.arrow-left         { background-position: -240px -96px; }
-.arrow-right        { background-position: -264px -96px; }
-.arrow-up           { background-position: -288px -96px; }
-.arrow-down         { background-position: -312px -96px; }
-.share-alt          { background-position: -336px -96px; }
-.resize-full        { background-position: -360px -96px; }
-.resize-small       { background-position: -384px -96px; }
-.plus               { background-position: -408px -96px; }
-.minus              { background-position: -432px -96px; }
-.asterisk           { background-position: -456px -96px; }
+.icon.arrow-left         { background-position: -240px -96px; }
+.icon.arrow-right        { background-position: -264px -96px; }
+.icon.arrow-up           { background-position: -288px -96px; }
+.icon.arrow-down         { background-position: -312px -96px; }
+.icon.share-alt          { background-position: -336px -96px; }
+.icon.resize-full        { background-position: -360px -96px; }
+.icon.resize-small       { background-position: -384px -96px; }
+.icon.plus               { background-position: -408px -96px; }
+.icon.minus              { background-position: -432px -96px; }
+.icon.asterisk           { background-position: -456px -96px; }