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

Conflicts:
	bootstrap-1.3.0.css
This commit is contained in:
Jacob Thornton
2011-09-09 22:48:57 -07:00
5 changed files with 129 additions and 39 deletions

View File

@@ -111,6 +111,10 @@ section > .row {
margin-bottom: 9px;
color: #333;
}
.quickstart .current-version,
.quickstart .current-version a {
color: #999;
}
.quickstart h6 {
color: #999;
}
@@ -142,15 +146,21 @@ section > .row {
}
.show-grid [class*="span"] {
background-color: #eee;
background-color: rgba(0,0,0,.1);
text-align: center;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
height: 30px;
min-height: 30px;
line-height: 30px;
}
.show-grid:hover [class*="span"] {
background: rgba(0, 0, 0, 0.25);
background-color: #ddd;
background-color: rgba(0,0,0,.2);
}
.show-grid .show-grid {
margin-top: 0;
margin-bottom: 0;
}
/* Render mini layout previews
-------------------------------------------------- */