Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins...

Conflicts:
	docs/assets/css/bootstrap.css

diff --cc docs/assets/css/bootstrap.css
index fb95729d905ab8506a94644394fe813f0996d46d,e36ec0b3cbab4d8e711b19cb90ef787429c4f1df..b87a1c8048626ed7c58bb62daa1faa1aa7f7dba2
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -6,7 -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: Fri Jan 27 16:25:59 PST 2012
 - * Date: Fri Jan 27 16:39:29 EST 2012
++ * Date: Fri Jan 27 16:35:26 PST 2012
   */
  article,
  aside,
@@@ -1091,9 -1087,13 +1095,13 @@@ table .span12 
    vertical-align: text-top;
    width: 14px;
    height: 14px;
+   *margin-right: .3em;
+ }
+ .icon:last-child {
+   *margin-left: 0;
  }
  .icon.white {
 -  background-image: url(../img/glyphicons-halflings-sprite-white.png);
 +  background-image: url(../img/glyphicons-halflings-white.png);
  }
  .icon.glass {
    background-position: 0      0;

diff --cc docs/base-css.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
Simple merge

diff --cc less/buttons.less
Simple merge

diff --cc less/navbar.less
Simple merge

diff --cc less/sprites.less
index c7cdc1710896041fdb6b94c6c1748b49c4fd99c1,fac416df332e2fa0561a7827139cdd6c67f109e2..ed456de1a5e69b8e3263f336d7b1403e11a2e838
--- 1/less/sprites.less
--- 2/less/sprites.less
+++ b/less/sprites.less
@@@ -21,9 -19,11 +21,11 @@@
    vertical-align: text-top;
    width: 14px;
    height: 14px;
+ 
+   .ie7-restore-right-whitespace;
  }
  .icon.white {
 -  background-image: url(../img/glyphicons-halflings-sprite-white.png);
 +  background-image: url(../img/glyphicons-halflings-white.png);
  }
  
  .icon.glass              { background-position: 0      0; }