diff options
| author | Mark Otto <[email protected]> | 2012-01-26 16:31:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-26 16:31:10 -0800 |
| commit | e7bc2063beb8ab1a36b5001d5847c6995b005a29 (patch) | |
| tree | 541f02a0744d2aad4c985d81a885e9e80270b983 /bootstrap.min.css | |
| parent | af96da6e895974dd4bd6fb19cf0c6d7e16bf050d (diff) | |
| parent | 7d292f5acc82cfc53a68b1452103c2367c0d8020 (diff) | |
| download | bootstrap-e7bc2063beb8ab1a36b5001d5847c6995b005a29.tar.xz bootstrap-e7bc2063beb8ab1a36b5001d5847c6995b005a29.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'bootstrap.min.css')
| -rw-r--r-- | bootstrap.min.css | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bootstrap.min.css b/bootstrap.min.css index cf78031f2..55ee17624 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -547,6 +547,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} |