2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

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

Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Mark Otto
2012-01-27 16:35:32 -08:00
11 changed files with 171 additions and 56 deletions
+2
View File
@@ -21,6 +21,8 @@
vertical-align: text-top;
width: 14px;
height: 14px;
.ie7-restore-right-whitespace;
}
.icon.white {
background-image: url(../img/glyphicons-halflings-white.png);