From d713f8341c26b1705a94fd890a92695d271dfb5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 20:33:52 -0700 Subject: 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. --- examples/jumbotron-narrow/index.html | 2 +- examples/jumbotron-narrow/jumbotron-narrow.css | 9 +++++---- examples/jumbotron/index.html | 9 +++++---- examples/jumbotron/jumbotron.css | 4 ---- examples/screenshots/jumbotron.jpg | Bin 78565 -> 77911 bytes 5 files changed, 11 insertions(+), 13 deletions(-) (limited to 'examples') 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 @@ -
+
  • Home
    • 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 @@
-
- - -
+ +
+

Hello, world!

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.

Learn more »

+
+
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 index aacbf8d34..46bce0c53 100644 Binary files a/examples/screenshots/jumbotron.jpg and b/examples/screenshots/jumbotron.jpg differ -- cgit v1.2.3