aboutsummaryrefslogtreecommitdiff
path: root/customize.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-23 22:56:23 -0700
committerMark Otto <[email protected]>2013-08-23 22:56:23 -0700
commitb86cd3bc3d866838127e7af15f665c70e7f50847 (patch)
tree0044cbd39cc9927c8a48ca178b019c049520e2ca /customize.html
parent22ce6499102c2ab87bbd8a303b5d26531c6e7df2 (diff)
parentd5a27855459325290ace93538f5ceafb22dee27a (diff)
downloadbootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.tar.xz
bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.zip
Merge branch 'master' into deprecate-screen-device-vars
Conflicts: less/variables.less
Diffstat (limited to 'customize.html')
-rw-r--r--customize.html16
1 files changed, 16 insertions, 0 deletions
diff --git a/customize.html b/customize.html
index 295c45bb8..6ec23ed29 100644
--- a/customize.html
+++ b/customize.html
@@ -380,6 +380,22 @@ base_url: "../"
<input type="text" class="form-control" placeholder="1.428571429" data-var="@line-height-base">
<p class="help-block">Used to calculate line-height throughout Bootstrap.</p>
</div>
+ <div class="col-lg-6">
+ <label>@font-size-h1</label>
+ <input type="text" class="form-control" placeholder="floor(@font-size-base * 2.60)" data-var="@font-size-h1">
+ <label>@font-size-h2</label>
+ <input type="text" class="form-control" placeholder="floor(@font-size-base * 2.15)" data-var="@font-size-h2">
+ <label>@font-size-h3</label>
+ <input type="text" class="form-control" placeholder="ceil(@font-size-base * 1.70)" data-var="@font-size-h3">
+ </div>
+ <div class="col-lg-6">
+ <label>@font-size-h4</label>
+ <input type="text" class="form-control" placeholder="ceil(@font-size-base * 1.25)" data-var="@font-size-h4">
+ <label>@font-size-h5</label>
+ <input type="text" class="form-control" placeholder="@font-size-base" data-var="@font-size-h5">
+ <label>@font-size-h6</label>
+ <input type="text" class="form-control" placeholder="ceil(@font-size-base * 0.85)" data-var="@font-size-h6">
+ </div>
</div>
<h3>Code blocks</h3>