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.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.css')
| -rw-r--r-- | bootstrap.css | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css index cadc4d243..086537f5f 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Jan 26 16:26:33 PST 2012 + * Date: Thu Jan 26 16:30:52 PST 2012 */ article, aside, @@ -3001,6 +3001,25 @@ a.thumbnail:hover { .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; } |