diff options
| author | Mark Otto <[email protected]> | 2013-08-17 20:33:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 20:33:52 -0700 |
| commit | d713f8341c26b1705a94fd890a92695d271dfb5b (patch) | |
| tree | 0ffc786352b0c87e59a10f058175c2cf4e69d503 /examples | |
| parent | d9e38312d24dc947ef479539fe2252f29bd1090d (diff) | |
| download | bootstrap-d713f8341c26b1705a94fd890a92695d271dfb5b.tar.xz bootstrap-d713f8341c26b1705a94fd890a92695d271dfb5b.zip | |
Update jumbotron
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display
Fixes #9759.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/jumbotron-narrow/index.html | 2 | ||||
| -rw-r--r-- | examples/jumbotron-narrow/jumbotron-narrow.css | 9 | ||||
| -rw-r--r-- | examples/jumbotron/index.html | 9 | ||||
| -rw-r--r-- | examples/jumbotron/jumbotron.css | 4 | ||||
| -rw-r--r-- | examples/screenshots/jumbotron.jpg | bin | 78565 -> 77911 bytes |
5 files changed, 11 insertions, 13 deletions
diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index 2c70f9148..ffcb3986e 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -18,7 +18,7 @@ <body> - <div class="container-narrow"> + <div class="container"> <div class="header"> <ul class="nav nav-pills pull-right"> <li class="active"><a href="#">Home</a></li> diff --git a/examples/jumbotron-narrow/jumbotron-narrow.css b/examples/jumbotron-narrow/jumbotron-narrow.css index 36a1d7cae..ea8e393bd 100644 --- a/examples/jumbotron-narrow/jumbotron-narrow.css +++ b/examples/jumbotron-narrow/jumbotron-narrow.css @@ -31,10 +31,11 @@ body { border-top: 1px solid #e5e5e5; } -/* Custom container */ -.container-narrow { - margin: 0 auto; - max-width: 700px; +/* Customize container */ +@media (min-width: 768px) { + .container { + max-width: 730px; + } } .container-narrow > hr { margin: 30px 0; diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index 23db4b6e6..a309fd5ad 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -59,15 +59,16 @@ </div> </div> - <div class="container"> - - <!-- Main jumbotron for a primary marketing message or call to action --> - <div class="jumbotron"> + <!-- Main jumbotron for a primary marketing message or call to action --> + <div class="jumbotron"> + <div class="container"> <h1>Hello, world!</h1> <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p> <p><a class="btn btn-primary btn-lg">Learn more »</a></p> </div> + </div> + <div class="container"> <div class="body-content"> <!-- Example row of columns --> diff --git a/examples/jumbotron/jumbotron.css b/examples/jumbotron/jumbotron.css index 594e2c794..f14b34c36 100644 --- a/examples/jumbotron/jumbotron.css +++ b/examples/jumbotron/jumbotron.css @@ -13,10 +13,6 @@ body { /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { - /* Let the jumbotron breathe */ - .jumbotron { - margin-top: 20px; - } /* Remove padding from wrapping element since we kick in the grid classes here */ .body-content { padding: 0; diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg Binary files differindex aacbf8d34..46bce0c53 100644 --- a/examples/screenshots/jumbotron.jpg +++ b/examples/screenshots/jumbotron.jpg |
