diff options
| author | Mark Otto <[email protected]> | 2014-06-18 22:29:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-18 22:29:37 -0700 |
| commit | d4eb5552b369e42026807edf469242df4ebd78ab (patch) | |
| tree | cac3cb1c60df318e9b677f7171b30d1068984e75 /docs/_includes | |
| parent | 2a380f6bd8c4f96ff59de88841968fd538caf538 (diff) | |
| parent | 53d68a099d1e99499a8b473896a7035444491f36 (diff) | |
| download | bootstrap-d4eb5552b369e42026807edf469242df4ebd78ab.tar.xz bootstrap-d4eb5552b369e42026807edf469242df4ebd78ab.zip | |
Merge branch 'master' into new_striped_progress_bar_class
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/components/panels.html | 1 | ||||
| -rw-r--r-- | docs/_includes/customizer-variables.html | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/_includes/components/panels.html b/docs/_includes/components/panels.html index b00cd0f72..acf32c51c 100644 --- a/docs/_includes/components/panels.html +++ b/docs/_includes/components/panels.html @@ -22,6 +22,7 @@ <h3 id="panels-heading">Panel with heading</h3> <p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code><h1></code>-<code><h6></code> with a <code>.panel-title</code> class to add a pre-styled heading.</p> + <p>For proper link coloring, be sure to place links in headings within <code>.panel-title</code>.</p> <div class="bs-example"> <div class="panel panel-default"> <div class="panel-heading">Panel heading without title</div> diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 075a0ea72..e318dd44d 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -1735,6 +1735,11 @@ <input id="input-@page-header-border-color" type="text" value="@gray-lighter" data-var="@page-header-border-color" class="form-control"/> <p class="help-block">Page header border color</p> </div> + <div class="bs-customizer-input"> + <label for="input-@dl-horizontal-offset">@dl-horizontal-offset</label> + <input id="input-@dl-horizontal-offset" type="text" value="@component-offset-horizontal" data-var="@dl-horizontal-offset" class="form-control"/> + <p class="help-block">Width of horizontal description list titles</p> + </div> </div> <h2 id="miscellaneous">Miscellaneous</h2> <p></p> |