rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00
Code Issues Actions Packages Releases Activity

Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class

Browse Source
This commit is contained in:
Mark Otto 2013-12-14 21:50:47 -08:00
parent 647e9eb0f1
commit 168469f545
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/css/bootstrap.css vendored
View File

@ -4278,19 +4278,17 @@ a.list-group-item.active > .badge,
.jumbotron { .jumbotron {
padding: 30px; padding: 30px;
margin-bottom: 30px; margin-bottom: 30px;
font-size: 21px;
font-weight: 200;
line-height: 2.1428571435;
color: inherit; color: inherit;
background-color: #eee; background-color: #eee;
} }
.jumbotron h1, .jumbotron h1,
.jumbotron .h1 { .jumbotron .h1 {
line-height: 1;
color: inherit; color: inherit;
} }
.jumbotron p { .jumbotron p {
line-height: 1.4; margin-bottom: 15px;
font-size: 21px;
font-weight: 200;
} }
.container .jumbotron { .container .jumbotron {
border-radius: 6px; border-radius: 6px;

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

File diff suppressed because one or more lines are too long

8
less/jumbotron.less
View File

@ -6,19 +6,17 @@
.jumbotron { .jumbotron {
padding: @jumbotron-padding; padding: @jumbotron-padding;
margin-bottom: @jumbotron-padding; margin-bottom: @jumbotron-padding;
font-size: @jumbotron-font-size;
font-weight: 200;
line-height: (@line-height-base * 1.5);
color: @jumbotron-color; color: @jumbotron-color;
background-color: @jumbotron-bg; background-color: @jumbotron-bg;
h1, h1,
.h1 { .h1 {
line-height: 1;
color: @jumbotron-heading-color; color: @jumbotron-heading-color;
} }
p { p {
line-height: 1.4; margin-bottom: (@jumbotron-padding / 2);
font-size: @jumbotron-font-size;
font-weight: 200;
} }
.container & { .container & {