diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
| commit | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (patch) | |
| tree | 0d896dedbbd47723ab769b139b63a5a58778e578 /customize.html | |
| parent | 3bfa630d2afe70452861b2466daab78daa47dda8 (diff) | |
| parent | 4afcebe0e71aafd0cfb501548a6591effdbe2e70 (diff) | |
| download | bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.tar.xz bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.zip | |
Merge branch 'master' into pr/11107
Conflicts:
docs-assets/js/raw-files.js
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/customize.html b/customize.html index 35b0a7436..a7a97ef27 100644 --- a/customize.html +++ b/customize.html @@ -56,7 +56,7 @@ base_url: "../" </div> <div class="checkbox"> <label> - <input type="checkbox" checked value="buttons.less"> + <input type="checkbox" checked value="buttons.less" data-dependents="button-groups.less"> Buttons </label> </div> @@ -399,7 +399,7 @@ base_url: "../" <input type="text" class="form-control" placeholder="Georgia, 'Times New Roman', Times, serif" data-var="@font-family-serif"> <p class="help-block">Default serif fonts.</p> <label>@font-family-monospace</label> - <input type="text" class="form-control" placeholder="Monaco, Menlo, Consolas, 'Courier New', monospace" data-var="@font-family-monospace"> + <input type="text" class="form-control" placeholder="Menlo, Monaco, Consolas, 'Courier New', monospace" data-var="@font-family-monospace"> <p class="help-block">Default monospace fonts for <code><code></code> and <code><pre></code>.</p> <h4>Base type styes</h4> @@ -436,7 +436,7 @@ base_url: "../" <div class="row"> <div class="col-lg-6"> <label>@headings-font-family</label> - <input type="text" class="form-control" placeholder="@font-family-base" data-var="@headings-font-family"> + <input type="text" class="form-control" placeholder="inherit" data-var="@headings-font-family"> <label>@headings-font-weight</label> <input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight"> </div> @@ -1056,7 +1056,7 @@ base_url: "../" <p class="help-block">Hovered dropdown menu entry text color</p> <label>@dropdown-link-hover-bg</label> <input type="text" class="form-control" placeholder="#f5f5f5" data-var="@dropdown-link-hover-bg"> - <p class="help-block">Hovered dropdown menu entry text color</p> + <p class="help-block">Hovered dropdown menu entry background color</p> <label>@dropdown-link-active-color</label> <input type="text" class="form-control" placeholder="@component-active-color" data-var="@dropdown-link-active-color"> @@ -1147,6 +1147,8 @@ base_url: "../" <h3>Wells</h3> <label>@well-bg</label> <input type="text" class="form-control" placeholder="#f5f5f5" data-var="@well-bg"> + <label>@well-border</label> + <input type="text" class="form-control" placeholder="darken(@well-bg, 7%)" data-var="@well-border"> <h2 id="variables-accordion">Accordion</h2> |