Commit ca2711fc authored by Mark Otto's avatar Mark Otto
Browse files

rewrite jumbotron less and make heading use a class

parent 3d6982c1
48 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!26437merge,!26197V4 dev xmr,!20778V4 dev,!20539Allow multiple modals,!18047#17986,!18988Blockquote border width,!20854Fixes 15534,!19272V4 dev xmr grunt html,!17218Issue 17066,!19581V4 fix popover,!18283Tether docs fix,!17229Include documentation for .navbar-static-top,!20493V4 dev display,!20636Fix docs for heading sizes,!19824blockquote-center,!22547Finished a new translation for bootstrap,!19534Docs 17264,!19533Npm deps,!22143Fix selectable disabled toggle radio buttons,!19084V4 rhythm,!18085Ie9 click comment,!22598test,!18829Add prefix to carousel classes,!18581Check getting started files for broken links - Issue 18568,!18067replace grunt-autoprefixer with gruntpostcss + autoprefixer,!20099V4.0.0 alpha.3,!20438V4 grid classes,!17307Vertical alignment on Bootstrap columns with equal height,!18477add utility color-contrast function,!18864Feature/navbar toggler support color schemes,!19602V4 palettes arun,!18311V4 dev xmr,!19448New pull request for testing,!19358XXL grid size,!19825.blockquote-center,!17508Fix usage of “its” and “it’s” (v4 docs),!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!19754Issue template,!19753Card img overlay padding,!19747Blockquote border width,!19580ExitStars,!18684Docs: change "Button" to "Go somewhere",!18661Docs: accessibility fix-up of collapsible content navbar, change site-wide main navbar,!17021v4
Showing with 56 additions and 46 deletions
+56 -46
......@@ -4172,13 +4172,6 @@ a.list-group-item.active > .badge,
color: inherit;
background-color: #eceeef;
}
.jumbotron h1,
.jumbotron .h1 {
color: inherit;
}
.jumbotron > hr {
border-top-color: #d0d5d8;
}
.container .jumbotron,
.container-fluid .jumbotron {
border-radius: .3rem;
......@@ -4186,16 +4179,22 @@ a.list-group-item.active > .badge,
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 48em) {
.jumbotron-heading {
color: inherit;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 48em) {
.jumbotron {
padding: 3.2rem 0;
}
.container .jumbotron {
.container .jumbotron,
.container-fluid .jumbotron {
padding-right: 4rem;
padding-left: 4rem;
}
.jumbotron h1,
.jumbotron .h1 {
.jumbotron-heading {
font-size: 4.5rem;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -7,18 +7,29 @@ A lightweight, flexible component that can optionally extend the entire viewport
{% example html %}
<div class="jumbotron">
<h1>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><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
<h1 class="jumbotron-heading">Hello, world!</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>
<p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
</div>
{% endexample %}
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="container">
...
</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 %}
......@@ -4172,13 +4172,6 @@ a.list-group-item.active > .badge,
color: inherit;
background-color: #eceeef;
}
.jumbotron h1,
.jumbotron .h1 {
color: inherit;
}
.jumbotron > hr {
border-top-color: #d0d5d8;
}
.container .jumbotron,
.container-fluid .jumbotron {
border-radius: .3rem;
......@@ -4186,16 +4179,22 @@ a.list-group-item.active > .badge,
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 48em) {
.jumbotron-heading {
color: inherit;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 48em) {
.jumbotron {
padding: 3.2rem 0;
}
.container .jumbotron {
.container .jumbotron,
.container-fluid .jumbotron {
padding-right: 4rem;
padding-left: 4rem;
}
.jumbotron h1,
.jumbotron .h1 {
.jumbotron-heading {
font-size: 4.5rem;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
......@@ -9,15 +9,6 @@
color: @jumbotron-color;
background-color: @jumbotron-bg;
h1,
.h1 {
color: @jumbotron-heading-color;
}
> hr {
border-top-color: darken(@jumbotron-bg, 10%);
}
.container &,
.container-fluid & {
.border-radius(@border-radius-large); // Only round corners at higher resolutions if contained in a container
......@@ -26,18 +17,28 @@
.container {
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;
.container & {
.container &,
.container-fluid & {
padding-left: (@jumbotron-padding * 2);
padding-right: (@jumbotron-padding * 2);
}
}
h1,
.h1 {
font-size: (@font-size-base * 4.5);
}
.jumbotron-heading {
font-size: (@font-size-base * 4.5);
}
}
Supports Markdown
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