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

1 files changed, 93 insertions, 90 deletions

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;}