rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

remove hella vars from the jumbotron

Browse Source
This commit is contained in:
Mark Otto 2015-08-12 20:28:46 -07:00
parent 0babe3568c
commit 314161cb17
11 changed files with 16 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/bootstrap.css
View File

@ -589,7 +589,7 @@ hr {
margin-top: 1rem;
margin-bottom: 1rem;
border: 0;
border-top: .0625rem solid #eceeef;
border-top: .0625rem solid rgba(0, 0, 0, .1);
}
small,
@ -4578,15 +4578,10 @@ a.label:hover {
.jumbotron {
padding: 2rem 1rem;
margin-bottom: 2rem;
color: inherit;
background-color: #eceeef;
border-radius: .3rem;
}
.jumbotron-heading {
color: inherit;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@ -4595,9 +4590,6 @@ a.label:hover {
.jumbotron {
padding: 4rem 2rem;
}
.jumbotron-heading {
font-size: 4.5rem;
}
}
.jumbotron-fluid {

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

21
docs/components/jumbotron.md
View File

@ -10,9 +10,13 @@ A lightweight, flexible component that can optionally extend the entire viewport
{% example html %}
<div class="jumbotron">
<h1 class="jumbotron-heading">Hello, world!</h1>
<h1 class="display-3">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" href="#" role="button">Learn more</a></p>
<hr class="m-y-md">
<p>It uses utility classes for typography and spacing to space content out within the larger container.</p>
<p class="lead">
<a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a>
</p>
</div>
{% endexample %}
@ -21,19 +25,8 @@ To make the jumbotron full width, and without rounded corners, add the `.jumbotr
{% example html %}
<div class="jumbotron jumbotron-fluid">
<div class="container">
<h1 class="jumbotron-heading">Fluid jumbotron</h1>
<h1 class="display-3">Fluid jumbotron</h1>
<p class="lead">This is a modified jumbotron that occupies the entire horizontal space of it's parent.</p>
</div>
</div>
{% endexample %}
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" href="#" role="button">Learn more</a></p>
</div>
{% endexample %}

10
docs/dist/css/bootstrap.css
View File

@ -589,7 +589,7 @@ hr {
margin-top: 1rem;
margin-bottom: 1rem;
border: 0;
border-top: .0625rem solid #eceeef;
border-top: .0625rem solid rgba(0, 0, 0, .1);
}
small,
@ -4578,15 +4578,10 @@ a.label:hover {
.jumbotron {
padding: 2rem 1rem;
margin-bottom: 2rem;
color: inherit;
background-color: #eceeef;
border-radius: .3rem;
}
.jumbotron-heading {
color: inherit;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@ -4595,9 +4590,6 @@ a.label:hover {
.jumbotron {
padding: 4rem 2rem;
}
.jumbotron-heading {
font-size: 4.5rem;
}
}
.jumbotron-fluid {

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

9
scss/_jumbotron.scss
View File

@ -6,15 +6,10 @@
.jumbotron {
padding: $jumbotron-padding ($jumbotron-padding / 2);
margin-bottom: $jumbotron-padding;
color: $jumbotron-color;
background-color: $jumbotron-bg;
@include border-radius($border-radius-lg);
}
.jumbotron-heading {
color: $jumbotron-heading-color;
}
.jumbotron-hr {
border-top-color: darken($jumbotron-bg, 10%);
}
@ -23,10 +18,6 @@
.jumbotron {
padding: ($jumbotron-padding * 2) $jumbotron-padding;
}
.jumbotron-heading {
font-size: $jumbotron-heading-font-size;
}
}
.jumbotron-fluid {

6
scss/_variables.scss
View File

@ -420,11 +420,7 @@ $pager-disabled-color: $pagination-disabled-color !default;
// Jumbotron
$jumbotron-padding: 2rem !default;
$jumbotron-color: inherit !default;
$jumbotron-bg: $gray-lighter !default;
$jumbotron-heading-color: inherit !default;
$jumbotron-heading-font-size: ($font-size-base * 4.5) !default;
// $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
// Form states and alerts
@ -632,4 +628,4 @@ $headings-small-color: $gray-light !default;
$blockquote-small-color: $gray-light !default;
$blockquote-font-size: ($font-size-base * 1.25) !default;
$blockquote-border-color: $gray-lighter !default;
$hr-border: $gray-lighter !default;
$hr-border: rgba(0,0,0,.1) !default;