diff options
| author | Mark Otto <[email protected]> | 2015-04-04 23:52:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-04-04 23:52:40 -0700 |
| commit | 510f56f334087b28581d4a8d02c92eebc693a92b (patch) | |
| tree | c22fcb51754524582a968063acf12eecbe16489a /docs/_includes/customizer-variables.html | |
| parent | a2c69b814509653c454c7a91b9a7ad4521808223 (diff) | |
| parent | 9c41aee780bc1008019684955be7a029679245ca (diff) | |
| download | bootstrap-510f56f334087b28581d4a8d02c92eebc693a92b.tar.xz bootstrap-510f56f334087b28581d4a8d02c92eebc693a92b.zip | |
Merge branch 'master' into fix_15830
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/customizer-variables.html')
| -rw-r--r-- | docs/_includes/customizer-variables.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 23a5046a6..6696e4e8f 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -1044,6 +1044,10 @@ <label for="input-@jumbotron-font-size">@jumbotron-font-size</label> <input id="input-@jumbotron-font-size" type="text" value="ceil((@font-size-base * 1.5))" data-var="@jumbotron-font-size" class="form-control"/> </div> + <div class="col-xs-4"> + <label for="input-@jumbotron-heading-font-size">@jumbotron-heading-font-size</label> + <input id="input-@jumbotron-heading-font-size" type="text" value="ceil((@font-size-base * 4.5))" data-var="@jumbotron-heading-font-size" class="form-control"/> + </div> </div> <h2 id="form-states-and-alerts">Form states and alerts</h2> <p>Define colors for form feedback states and, by default, alerts.</p> |