fix #9832 somewhat: more vars for jumbotron

diff --git a/customize.html b/customize.html
index 7ee22bc08da4f493a47b05402126cd7760582046..91e9d38c205595efc8eb666bc63997c6b39ea44d 100644 (file)
--- a/customize.html
+++ b/customize.html
@@ -1036,20 +1036,21 @@ base_url: "../"
 
     <h2 id="variables-jumbotron">Jumbotron</h2>
     <div class="row">
-      <div class="col-lg-4">
+      <div class="col-lg-3">
+        <label>@jumbotron-padding</label>
+        <input type="text" class="form-control" placeholder="30px" data-var="@jumbotron-padding">
+      </div>
+      <div class="col-lg-3">
         <label>@jumbotron-bg</label>
         <input type="text" class="form-control" placeholder="@gray-lighter" data-var="@jumbotron-bg">
-        <p class="help-block">Jumbotron background color</p>
       </div>
-      <div class="col-lg-4">
+      <div class="col-lg-3">
+        <label>@jumbotron-color</label>
+        <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-color">
+      </div>
+      <div class="col-lg-3">
         <label>@jumbotron-heading-color</label>
         <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-heading-color">
-        <p class="help-block">Jumbotron heading color</p>
-      </div>
-      <div class="col-lg-4">
-        <label>@jumbotron-lead-color</label>
-        <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-lead-color">
-        <p class="help-block">Jumbotron lead paragraph color</p>
       </div>
     </div>
 

diff --git a/less/jumbotron.less b/less/jumbotron.less
index bb5a71fb535d4032478e3b8cdfc9e5b7a91414d0..0857f2179141ab299e4a4493d79a57933d6c18f8 100644 (file)
--- a/less/jumbotron.less
+++ b/less/jumbotron.less
@@ -9,7 +9,7 @@
   font-size: (@font-size-base * 1.5);
   font-weight: 200;
   line-height: (@line-height-base * 1.5);
-  color: @jumbotron-lead-color;
+  color: @jumbotron-color;
   background-color: @jumbotron-bg;
 
   h1 {

diff --git a/less/variables.less b/less/variables.less
index eadd78fb85e572c8aca4bdf19be47995f912db71..958f9515cea4b9a9734ed3745d102c2f100df361 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -351,9 +351,11 @@
 // Jumbotron
 // -------------------------
 
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
 @jumbotron-bg:                   @gray-lighter;
+
 @jumbotron-heading-color:        inherit;
-@jumbotron-lead-color:           inherit;
 
 
 // Form states and alerts