aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-19 08:46:49 -0700
committerMark Otto <[email protected]>2013-08-19 08:46:49 -0700
commit7e82ceb53398968b8ce892d93639097d20bf78d6 (patch)
treead610c17b8d364ddec41e0f377ebaef46f7d7412
parent285393fb770bd3c3e3605d0d845a164887d0970d (diff)
downloadbootstrap-7e82ceb53398968b8ce892d93639097d20bf78d6.tar.xz
bootstrap-7e82ceb53398968b8ce892d93639097d20bf78d6.zip
fix #9832 somewhat: more vars for jumbotron
-rw-r--r--customize.html19
-rw-r--r--less/jumbotron.less2
-rw-r--r--less/variables.less4
3 files changed, 14 insertions, 11 deletions
diff --git a/customize.html b/customize.html
index 7ee22bc08..91e9d38c2 100644
--- 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 bb5a71fb5..0857f2179 100644
--- 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 eadd78fb8..958f9515c 100644
--- 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