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

24 files changed, 6 insertions, 4 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 0bd063ee7..23dbd76fc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2229,6 +2229,7 @@ table .span24 {
 }
 
 .icon-random {
+  width: 16px;
   background-position: -216px -120px;
 }
 
@@ -2261,6 +2262,7 @@ table .span24 {
 }
 
 .icon-folder-open {
+  width: 16px;
   background-position: -408px -120px;
 }
 
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
index 135c9babb..2d398982b 100644
--- a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
+++ b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
index 704e5dfe4..7a89371a4 100644
--- a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
+++ b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
index 430fde2cf..3638f1564 100644
--- a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
+++ b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
diff --git a/docs/assets/img/example-sites/kippt.png b/docs/assets/img/example-sites/kippt.png
index 4afa772cc..022abfa8c 100644
--- a/docs/assets/img/example-sites/kippt.png
+++ b/docs/assets/img/example-sites/kippt.png
diff --git a/docs/assets/img/example-sites/soundready.png b/docs/assets/img/example-sites/soundready.png
index 2675ff911..94e0e01b1 100644
--- a/docs/assets/img/example-sites/soundready.png
+++ b/docs/assets/img/example-sites/soundready.png
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.jpg b/docs/assets/img/examples/bootstrap-example-fluid.jpg
index 151b987cb..d616ba001 100644
--- a/docs/assets/img/examples/bootstrap-example-fluid.jpg
+++ b/docs/assets/img/examples/bootstrap-example-fluid.jpg
diff --git a/docs/assets/img/examples/bootstrap-example-hero.jpg b/docs/assets/img/examples/bootstrap-example-hero.jpg
index cd4a32107..a9662d2b4 100644
--- a/docs/assets/img/examples/bootstrap-example-hero.jpg
+++ b/docs/assets/img/examples/bootstrap-example-hero.jpg
diff --git a/docs/assets/img/examples/bootstrap-example-starter.jpg b/docs/assets/img/examples/bootstrap-example-starter.jpg
index 09c8a066d..3b1cbf9e7 100644
--- a/docs/assets/img/examples/bootstrap-example-starter.jpg
+++ b/docs/assets/img/examples/bootstrap-example-starter.jpg
diff --git a/docs/assets/img/github-16px.png b/docs/assets/img/github-16px.png
index c99ab237a..8436e0de9 100644
--- a/docs/assets/img/github-16px.png
+++ b/docs/assets/img/github-16px.png
diff --git a/docs/assets/img/glyphicons/glyphicons_009_magic.png b/docs/assets/img/glyphicons/glyphicons_009_magic.png
index f1cfb3785..4c039989e 100644
--- a/docs/assets/img/glyphicons/glyphicons_009_magic.png
+++ b/docs/assets/img/glyphicons/glyphicons_009_magic.png
diff --git a/docs/assets/img/glyphicons/glyphicons_042_group.png b/docs/assets/img/glyphicons/glyphicons_042_group.png
index be5c6f94b..771ef275b 100644
--- a/docs/assets/img/glyphicons/glyphicons_042_group.png
+++ b/docs/assets/img/glyphicons/glyphicons_042_group.png
diff --git a/docs/assets/img/glyphicons/glyphicons_079_podium.png b/docs/assets/img/glyphicons/glyphicons_079_podium.png
index 20b7c99b9..1f9976bfb 100644
--- a/docs/assets/img/glyphicons/glyphicons_079_podium.png
+++ b/docs/assets/img/glyphicons/glyphicons_079_podium.png
diff --git a/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png
index 751e3b718..1466b892a 100644
--- a/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png
+++ b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png
diff --git a/docs/assets/img/glyphicons/glyphicons_163_iphone.png b/docs/assets/img/glyphicons/glyphicons_163_iphone.png
index 926df7e55..0a5f88d4b 100644
--- a/docs/assets/img/glyphicons/glyphicons_163_iphone.png
+++ b/docs/assets/img/glyphicons/glyphicons_163_iphone.png
diff --git a/docs/assets/img/glyphicons/glyphicons_214_resize_small.png b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png
index 707d9e03e..32a62a471 100644
--- a/docs/assets/img/glyphicons/glyphicons_214_resize_small.png
+++ b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png
diff --git a/docs/assets/img/icon-css3.png b/docs/assets/img/icon-css3.png
index 58e107235..4800e1037 100644
--- a/docs/assets/img/icon-css3.png
+++ b/docs/assets/img/icon-css3.png
diff --git a/docs/assets/img/icon-github.png b/docs/assets/img/icon-github.png
index 1a5fb781e..03d9541dc 100644
--- a/docs/assets/img/icon-github.png
+++ b/docs/assets/img/icon-github.png
diff --git a/docs/assets/img/icon-twitter.png b/docs/assets/img/icon-twitter.png
index a4716545f..e7abbbc4e 100644
--- a/docs/assets/img/icon-twitter.png
+++ b/docs/assets/img/icon-twitter.png
diff --git a/docs/assets/img/less-logo-large.png b/docs/assets/img/less-logo-large.png
index cb56637cb..8f62ffbe0 100644
--- a/docs/assets/img/less-logo-large.png
+++ b/docs/assets/img/less-logo-large.png
diff --git a/docs/assets/img/responsive-illustrations.png b/docs/assets/img/responsive-illustrations.png
index 6ca0f0788..a4bcbe302 100644
--- a/docs/assets/img/responsive-illustrations.png
+++ b/docs/assets/img/responsive-illustrations.png
diff --git a/docs/index.html b/docs/index.html
index 60a784160..99f2f7714 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -84,7 +84,7 @@
     <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
     <p class="download-info">
       <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large" >View project on GitHub</a>
-      <a href="assets/bootstrap.zip" class="btn btn-large" >Download Bootstrap <small>(v2.0.4)</small></a>
+      <a href="assets/bootstrap.zip" class="btn btn-large" >Download Bootstrap <small>(v2.1.0)</small></a>
     </p>
   </div>
 
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index f14e95c14..f36385f30 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -6,7 +6,7 @@
     <p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p>
     <p class="download-info">
       <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'GitHub Project', 'View project on GitHub']);"{{/production}}>{{_i}}View project on GitHub{{/i}}</a>
-      <a href="assets/bootstrap.zip" class="btn btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.0.4']);"{{/production}}>{{_i}}Download Bootstrap <small>(v2.0.4)</small>{{/i}}</a>
+      <a href="assets/bootstrap.zip" class="btn btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.0']);"{{/production}}>{{_i}}Download Bootstrap <small>(v2.1.0)</small>{{/i}}</a>
     </p>
   </div>
 
diff --git a/less/sprites.less b/less/sprites.less
index 72a3a916b..753871cd7 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -145,7 +145,7 @@
 .icon-warning-sign       { background-position: -144px -120px; }
 .icon-plane              { background-position: -168px -120px; }
 .icon-calendar           { background-position: -192px -120px; }
-.icon-random             { background-position: -216px -120px; }
+.icon-random             { background-position: -216px -120px; width: 16px; }
 .icon-comment            { background-position: -240px -120px; }
 .icon-magnet             { background-position: -264px -120px; }
 .icon-chevron-up         { background-position: -288px -120px; }
@@ -153,7 +153,7 @@
 .icon-retweet            { background-position: -336px -120px; }
 .icon-shopping-cart      { background-position: -360px -120px; }
 .icon-folder-close       { background-position: -384px -120px; }
-.icon-folder-open        { background-position: -408px -120px; }
+.icon-folder-open        { background-position: -408px -120px; width: 16px; }
 .icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
 .icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off