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

4 files changed, 114 insertions, 107 deletions

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