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

Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
This commit is contained in:
Mark Otto
2012-07-17 23:14:58 -07:00
4 changed files with 182 additions and 0 deletions

View File

@@ -1728,6 +1728,18 @@ table {
border-top: 2px solid #dddddd;
}
.table .success td {
background-color: #dff0d8;
}
.table .error td {
background-color: #f2dede;
}
.table .info td {
background-color: #d9edf7;
}
.table-condensed th,
.table-condensed td {
padding: 4px 5px;