diff options
| author | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
| commit | 219f0fe7c54d6ece4fcfc58b140189c12e63f360 (patch) | |
| tree | 0355fdccf1ff8599f63a883dd4723c8d977e1e00 /customize.html | |
| parent | 0faf42b4bc3fd301beaa5b5f9b4d367f69899b05 (diff) | |
| parent | ac3cb6974ad0573812b65a2054a5809da9946cb6 (diff) | |
| download | bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.tar.xz bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.zip | |
Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/customize.html b/customize.html index fcff58192..866ce83f5 100644 --- a/customize.html +++ b/customize.html @@ -660,12 +660,21 @@ base_url: "../" </div> <h2 id="variables-alerts">Alerts</h2> - <p>Define alert colors and border radius.</p> + <p>Define alert colors, border radius, and padding.</p> <h4>Border radius</h4> + <label>@alert-padding</label> + <input type="text" class="form-control" placeholder="15px"> <label>@alert-border-radius</label> <input type="text" class="form-control" placeholder="@border-radius-base"> <div class="row"> <div class="col-lg-6"> + <h4>Default (Warning)</h4> + <label>@alert-text</label> + <input type="text" class="form-control" placeholder="@state-warning-text"> + <label>@alert-bg</label> + <input type="text" class="form-control" placeholder="@state-warning-bg"> + <label>@alert-border</label> + <input type="text" class="form-control" placeholder="@state-warning-border"> <h4>Success</h4> <label>@alert-success-text</label> <input type="text" class="form-control" placeholder="@state-success-text"> @@ -673,13 +682,6 @@ base_url: "../" <input type="text" class="form-control" placeholder="@state-success-bg"> <label>@alert-success-border</label> <input type="text" class="form-control" placeholder="@state-success-border"> - <h4>Warning</h4> - <label>@alert-warning-text</label> - <input type="text" class="form-control" placeholder="@state-warning-text"> - <label>@alert-warning-bg</label> - <input type="text" class="form-control" placeholder="@state-warning-bg"> - <label>@alert-warning-border</label> - <input type="text" class="form-control" placeholder="@state-warning-border"> </div> <div class="col-lg-6"> <h4>Danger</h4> |