diff options
| author | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
| commit | 402dbfb6171e18aa44e19429e796169f02b0adf7 (patch) | |
| tree | aeb0cef7cc1b04988307a0ef79b07fbe2d7d197c /customize.html | |
| parent | 7e19b6b02ccd5417a6c2d3d418c08219773f1112 (diff) | |
| parent | 41bdd1a4823feb8b46b2fccfeec3e9c5057a0665 (diff) | |
| download | bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.tar.xz bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.zip | |
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/customize.html b/customize.html index ad283c64d..866ce83f5 100644 --- a/customize.html +++ b/customize.html @@ -486,7 +486,7 @@ base_url: "../" <p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p> <div class="row"> <div class="col-lg-6"> - <label>@screen-tiny</label> + <label>@screen-xsmall</label> <input type="text" class="form-control" placeholder="480px"> <label>@screen-small</label> <input type="text" class="form-control" placeholder="768px"> @@ -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> @@ -710,6 +712,8 @@ base_url: "../" <input type="text" class="form-control" placeholder="#777"> <label>@navbar-bg</label> <input type="text" class="form-control" placeholder="#eee"> + <label>@navbar-border-radius</label> + <input type="text" class="form-control" placeholder="@border-radius-base"> <h4>Links</h4> <label>@navbar-link-color</label> <input type="text" class="form-control" placeholder="#777"> @@ -1439,7 +1443,7 @@ base_url: "../" </div> <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p> <div class="bs-customize-download"> - <a class="btn btn-block btn-large btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> + <a class="btn btn-block btn-lg btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> </div> <div class="bs-callout bs-callout-danger"> <h4>What's included?</h4> |