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

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

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>
 

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>
 

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