From: Mark Otto <markdotto@gmail.com>
Date: Sat, 28 Jan 2012 00:35:32 +0000 (-0800)
Subject: Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins... 
X-Git-Tag: v2.0.0~6^2~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9759abeebbca0681054f8da3ff7c3029948284e;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/css/bootstrap.css
---

d9759abeebbca0681054f8da3ff7c3029948284e
diff --cc docs/assets/css/bootstrap.css
index fb95729d90,e36ec0b3cb..b87a1c8048
--- a/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 less/sprites.less
index c7cdc17108,fac416df33..ed456de1a5
--- a/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; }