diff options
| author | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
| commit | 8ff18a9ffc9171977e58ecb517cad677ba1727b6 (patch) | |
| tree | 4b9149269be92fdc07e373eb5216068ae5df7ce6 /docs/assets/css/docs.css | |
| parent | b188c0da8b51cd18d6fa3fa958e823a318ba5f10 (diff) | |
| parent | d1b594db7a7307efd7de29a2875046166c69a76f (diff) | |
| download | bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.tar.xz bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.zip | |
fixing conflict and recompiling
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cb1dbb2f7..f2ccd0060 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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; |