diff options
| author | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
| commit | 265fda7903e189ee0d2d7201cc92bf384fc53043 (patch) | |
| tree | cf2249e0696d6ea2923678f9f7b155e265756f03 /customize.html | |
| parent | a46003b8c7cc20bf4f72b7638a74643353ae047f (diff) | |
| parent | 727a91de1cdf5cbc4f25528e073480332a5940c5 (diff) | |
| download | bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.tar.xz bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.zip | |
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/customize.html b/customize.html index 82b712de2..16e68e059 100644 --- a/customize.html +++ b/customize.html @@ -629,9 +629,6 @@ base_url: "../" <input type="text" class="form-control" placeholder="@brand-info" data-var="@btn-info-bg"> <label>@btn-info-border</label> <input type="text" class="form-control" placeholder="darken(@btn-info-bg, 5%)" data-var="@btn-info-border"> - <h4>Button hover</h4> - <label>@btn-hover-color</label> - <input type="text" class="form-control" placeholder="@btn-default-color" data-var="@btn-hover-color"> </div> <div class="col-md-6"> <h4>Success</h4> |