aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/customizer-variables.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-18 14:11:55 -0800
committerMark Otto <[email protected]>2014-01-18 14:11:55 -0800
commitcd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa (patch)
tree0c0a716f3f567c7bd17fb9f6fb254100d78d0e18 /docs/_includes/customizer-variables.html
parentb121207e10ad20e6d1d8dc269f71697ad26a67e6 (diff)
parentb1721f42cc8298fb691530614ee6d52389872e25 (diff)
downloadbootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.tar.xz
bootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.zip
Merge branch 'master' into bg-variant
Diffstat (limited to 'docs/_includes/customizer-variables.html')
-rw-r--r--docs/_includes/customizer-variables.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 0b4429d72..89fb39dec 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -131,7 +131,7 @@
<div class="bs-customizer-input">
<label for="input-@line-height-computed">@line-height-computed</label>
<input id="input-@line-height-computed" type="text" value="floor((@font-size-base * @line-height-base))" data-var="@line-height-computed" class="form-control"/>
- <p class="help-block">Computed &quot;line-height&quot; (<code>font-size</code> &amp;times; <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p>
+ <p class="help-block">Computed &quot;line-height&quot; (<code>font-size</code> * <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p>
</div>
<div class="bs-customizer-input">
<label for="input-@headings-font-family">@headings-font-family</label>
@@ -1117,7 +1117,7 @@
<div class="bs-customizer-input">
<label for="input-@modal-content-fallback-border-color">@modal-content-fallback-border-color</label>
<input id="input-@modal-content-fallback-border-color" type="text" value="#999" data-var="@modal-content-fallback-border-color" class="form-control"/>
- <p class="help-block">Modal content border color &lt;strong&gt;for IE8&lt;/strong&gt;</p>
+ <p class="help-block">Modal content border color <strong>for IE8</strong></p>
</div>
<div class="bs-customizer-input">
<label for="input-@modal-backdrop-bg">@modal-backdrop-bg</label>