Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove...

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

Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove...
Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class
168469f5 · Mark Otto · 647e9eb0 · 168469f5 · 168469f5 · 168469f5
Commit 168469f5 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

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

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/jumbotron.less
+++ b/less/jumbotron.less
@@ -6,19 +6,17 @@
 .jumbotron {
  padding: @jumbotron-padding;
  margin-bottom: @jumbotron-padding;
-  font-size: @jumbotron-font-size;
-  font-weight: 200;
-  line-height: (@line-height-base * 1.5);
  color: @jumbotron-color;
  background-color: @jumbotron-bg;

  h1,
  .h1 {
-    line-height: 1;
    color: @jumbotron-heading-color;
  }
  p {
-    line-height: 1.4;
+    margin-bottom: (@jumbotron-padding / 2);
+    font-size: @jumbotron-font-size;
+    font-weight: 200;
  }

  .container & {