Commit ca2711fc authored by Mark Otto's avatar Mark Otto

rewrite jumbotron less and make heading use a class

parent 3d6982c1
...@@ -4172,13 +4172,6 @@ a.list-group-item.active > .badge, ...@@ -4172,13 +4172,6 @@ a.list-group-item.active > .badge,
color: inherit; color: inherit;
background-color: #eceeef; background-color: #eceeef;
} }
.jumbotron h1,
.jumbotron .h1 {
color: inherit;
}
.jumbotron > hr {
border-top-color: #d0d5d8;
}
.container .jumbotron, .container .jumbotron,
.container-fluid .jumbotron { .container-fluid .jumbotron {
border-radius: .3rem; border-radius: .3rem;
...@@ -4186,16 +4179,22 @@ a.list-group-item.active > .badge, ...@@ -4186,16 +4179,22 @@ a.list-group-item.active > .badge,
.jumbotron .container { .jumbotron .container {
max-width: 100%; max-width: 100%;
} }
@media screen and (min-width: 48em) { .jumbotron-heading {
color: inherit;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 48em) {
.jumbotron { .jumbotron {
padding: 3.2rem 0; padding: 3.2rem 0;
} }
.container .jumbotron { .container .jumbotron,
.container-fluid .jumbotron {
padding-right: 4rem; padding-right: 4rem;
padding-left: 4rem; padding-left: 4rem;
} }
.jumbotron h1, .jumbotron-heading {
.jumbotron .h1 {
font-size: 4.5rem; font-size: 4.5rem;
} }
} }
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -7,18 +7,29 @@ A lightweight, flexible component that can optionally extend the entire viewport ...@@ -7,18 +7,29 @@ A lightweight, flexible component that can optionally extend the entire viewport
{% example html %} {% example html %}
<div class="jumbotron"> <div class="jumbotron">
<h1>Hello, world!</h1> <h1 class="jumbotron-heading">Hello, world!</h1>
<p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p> <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
<p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p> <p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
</div> </div>
{% endexample %} {% endexample %}
To make the jumbotron full width, and without rounded corners, place it outside all `.container`s and instead add a `.container` within. To make the jumbotron full width, and without rounded corners, place it outside all `.container`s and instead add a `.container` within.
{% example html %} {% highlight html %}
<div class="jumbotron"> <div class="jumbotron">
<div class="container"> <div class="container">
... ...
</div> </div>
</div> </div>
{% endhighlight %}
Jumbotrons also come with an adaptive `hr`—just add `.jumbotron-hr` to the element and the `border-top-color` will be tinted based on the jumbotron background.
{% example html %}
<div class="jumbotron">
<h1 class="jumbotron-heading">Jumbotron <code>hr</code></h1>
<p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
<hr class="jumbotron-hr">
<p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
</div>
{% endexample %} {% endexample %}
...@@ -4172,13 +4172,6 @@ a.list-group-item.active > .badge, ...@@ -4172,13 +4172,6 @@ a.list-group-item.active > .badge,
color: inherit; color: inherit;
background-color: #eceeef; background-color: #eceeef;
} }
.jumbotron h1,
.jumbotron .h1 {
color: inherit;
}
.jumbotron > hr {
border-top-color: #d0d5d8;
}
.container .jumbotron, .container .jumbotron,
.container-fluid .jumbotron { .container-fluid .jumbotron {
border-radius: .3rem; border-radius: .3rem;
...@@ -4186,16 +4179,22 @@ a.list-group-item.active > .badge, ...@@ -4186,16 +4179,22 @@ a.list-group-item.active > .badge,
.jumbotron .container { .jumbotron .container {
max-width: 100%; max-width: 100%;
} }
@media screen and (min-width: 48em) { .jumbotron-heading {
color: inherit;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 48em) {
.jumbotron { .jumbotron {
padding: 3.2rem 0; padding: 3.2rem 0;
} }
.container .jumbotron { .container .jumbotron,
.container-fluid .jumbotron {
padding-right: 4rem; padding-right: 4rem;
padding-left: 4rem; padding-left: 4rem;
} }
.jumbotron h1, .jumbotron-heading {
.jumbotron .h1 {
font-size: 4.5rem; font-size: 4.5rem;
} }
} }
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -9,15 +9,6 @@ ...@@ -9,15 +9,6 @@
color: @jumbotron-color; color: @jumbotron-color;
background-color: @jumbotron-bg; background-color: @jumbotron-bg;
h1,
.h1 {
color: @jumbotron-heading-color;
}
> hr {
border-top-color: darken(@jumbotron-bg, 10%);
}
.container &, .container &,
.container-fluid & { .container-fluid & {
.border-radius(@border-radius-large); // Only round corners at higher resolutions if contained in a container .border-radius(@border-radius-large); // Only round corners at higher resolutions if contained in a container
...@@ -26,18 +17,28 @@ ...@@ -26,18 +17,28 @@
.container { .container {
max-width: 100%; max-width: 100%;
} }
}
@media screen and (min-width: @screen-sm-min) { .jumbotron-heading {
color: @jumbotron-heading-color;
}
.jumbotron-hr {
border-top-color: darken(@jumbotron-bg, 10%);
}
@media (min-width: @screen-sm-min) {
.jumbotron {
padding: (@jumbotron-padding * 1.6) 0; padding: (@jumbotron-padding * 1.6) 0;
.container & { .container &,
.container-fluid & {
padding-left: (@jumbotron-padding * 2); padding-left: (@jumbotron-padding * 2);
padding-right: (@jumbotron-padding * 2); padding-right: (@jumbotron-padding * 2);
} }
}
h1, .jumbotron-heading {
.h1 { font-size: (@font-size-base * 4.5);
font-size: (@font-size-base * 4.5);
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment