2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00

fixing conflict and recompiling

This commit is contained in:
Mark Otto
2011-09-16 09:47:36 -07:00
18 changed files with 61 additions and 67 deletions
+4 -4
View File
@@ -184,8 +184,8 @@ section > .row {
margin-bottom: 10px;
}
.show-grid [class*="span"] {
background-color: #eee;
background-color: rgba(0,0,0,.1);
background: #eee;
background: rgba(0,0,0,.1);
text-align: center;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -194,8 +194,8 @@ section > .row {
line-height: 30px;
}
.show-grid:hover [class*="span"] {
background-color: #ddd;
background-color: rgba(0,0,0,.2);
background: #ddd;
background: rgba(0,0,0,.2);
}
.show-grid .show-grid {
margin-top: 0;