diff options
| author | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
| commit | 1bc8607bdffe641d58191084b214138a98aba229 (patch) | |
| tree | ffb2855b592ee37c5068da181a4c3fb335a322da /customize.html | |
| parent | 9e38e255343a4fd5fa2fa932c96be9cb5c902337 (diff) | |
| parent | d15218a09ce68d0854d0aa5f5170c1ea859aee31 (diff) | |
| download | bootstrap-1bc8607bdffe641d58191084b214138a98aba229.tar.xz bootstrap-1bc8607bdffe641d58191084b214138a98aba229.zip | |
Merge branch 'master' into css-source-maps
Conflicts:
Gruntfile.js
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/customize.html b/customize.html index 53ed8d710..2b9e5d770 100644 --- a/customize.html +++ b/customize.html @@ -184,6 +184,12 @@ base_url: "../" <h3>JavaScript components</h3> <div class="checkbox"> <label> + <input type="checkbox" checked value="component-animations.less"> + Component animations (for JS) + </label> + </div> + <div class="checkbox"> + <label> <input type="checkbox" checked value="dropdowns.less"> Dropdowns </label> @@ -226,12 +232,6 @@ base_url: "../" Responsive utilities </label> </div> - <div class="checkbox"> - <label> - <input type="checkbox" checked value="component-animations.less"> - Component animations (for JS) - </label> - </div> </div><!-- .col-xs-6 .col-sm-4 --> </div><!-- /.row --> </div> @@ -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> |