diff options
author | Mark Otto <otto@github.com> | 2013-07-18 06:33:30 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2013-07-18 06:33:30 +0400 |
commit | 542e03ae3a2209b87e4db999b6ea869faf9293a9 (patch) | |
tree | d7dd6d8784884eb96b0d7bb7d6a33bd62baa61f5 /docs/customize.html | |
parent | 06d47b008233c487844146cf1cc037d691068a0a (diff) | |
parent | b4e0e4fee65fb50f7981d28bb875083e0da1a303 (diff) |
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
Conflicts:
docs/components.html
docs/css.html
docs/customize.html
Diffstat (limited to 'docs/customize.html')
-rw-r--r-- | docs/customize.html | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/customize.html b/docs/customize.html index 7d2b4f2540..876d81ddee 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -349,9 +349,15 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge </div> </div> </div> - <div class="bs-callout"> - <h4>Heads up!</h4> - <p>All checked plugins will be compiled into a single file, <code>bootstrap.js</code>. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p> + + <div class="bs-callout bs-callout-info"> + <h4>Produces two files</h4> + <p>All checked plugins will be compiled into a readable <code>bootstrap.js</code> and a minified <code>bootstrap.min.js</code>. We recommend you use the minified version in production.</p> + </div> + + <div class="bs-callout bs-callout-danger"> + <h4>jQuery required</h4> + <p>All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p> </div> </div> @@ -1151,7 +1157,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge <div class="bs-customize-download"> <a class="btn" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> </div> - <div class="bs-callout"> + <div class="bs-callout bs-callout-danger"> <h4>What's included?</h4> <p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p> </div> |