aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-01-17 14:27:54 -0800
committerChris Rebert <[email protected]>2014-01-17 14:28:01 -0800
commitd8c87ddc285c598f09cb70e2244d7cef5a8e5bad (patch)
treea57b1c7ba582c0d0f8de0ef44be136be3387f5c0
parent084f0fb11351e899decc33faf53ada85d29ea7fa (diff)
downloadbootstrap-d8c87ddc285c598f09cb70e2244d7cef5a8e5bad.tar.xz
bootstrap-d8c87ddc285c598f09cb70e2244d7cef5a8e5bad.zip
fix #12277
Thanks to @Quy for pointing these out.
-rw-r--r--docs/_includes/customizer-variables.html4
-rw-r--r--less/variables.less4
2 files changed, 4 insertions, 4 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>
diff --git a/less/variables.less b/less/variables.less
index 106a73457..d9147eb59 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -58,7 +58,7 @@
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
-//** Computed "line-height" (`font-size` &times; `line-height`) for use with `margin`, `padding`, etc.
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`.
@@ -548,7 +548,7 @@
@modal-content-bg: #fff;
//** Modal content border color
@modal-content-border-color: rgba(0,0,0,.2);
-//** Modal content border color <strong>for IE8</strong>
+//** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999;
//** Modal backdrop background color