diff options
| author | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
| commit | 122245fe87bbd293a82ffa6b9c37d8b174b3dc0f (patch) | |
| tree | 35679d94b5787a2ffaf712caa0fab3bf47dd8fa3 /customize.html | |
| parent | 0fcaca86b57bf3a4fa2c8f709e90499c92e0db73 (diff) | |
| parent | 55f6beb4278979155549e17da6e87a2548ec0b88 (diff) | |
| download | bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.tar.xz bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.zip | |
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/customize.html b/customize.html index 5b15a4c5a..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> @@ -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> @@ -1247,6 +1249,11 @@ base_url: "../" <input type="text" class="form-control" placeholder="#000" data-var="@modal-backdrop-bg"> <p class="help-block">Modal backdrop background color</p> </div> + <div class="col-md-4"> + <label>@modal-backdrop-opacity</label> + <input type="text" class="form-control" placeholder=".5" data-var="@modal-backdrop-opacity"> + <p class="help-block">Modal backdrop opacity</p> + </div> </div> <h3>Modal header and footer</h3> |