diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/_jade | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_jade')
| -rw-r--r-- | docs/_jade/customizer-variables.jade | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/_jade/customizer-variables.jade b/docs/_jade/customizer-variables.jade index bd0df1d13..fbbddcba4 100644 --- a/docs/_jade/customizer-variables.jade +++ b/docs/_jade/customizer-variables.jade @@ -13,11 +13,13 @@ each section in sections div.clearfix div.col-xs-4 label(for="input-" + variable.name)= variable.name + - var helpId = "help-block-" + variable.name input.form-control( id="input-" + variable.name type="text" + aria-describedby=variable.docstring ? helpId : undefined value=variable.defaultValue data-var=variable.name) if variable.docstring - p.help-block!= variable.docstring.html + p.help-block(id=helpId)!= variable.docstring.html // NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template. |