From: Mark Otto Date: Thu, 18 Jul 2013 02:33:30 +0000 (-0700) Subject: Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip... X-Git-Tag: v3.0.0-rc1~161^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542e03ae3a2209b87e4db999b6ea869faf9293a9;p=thirdparty%2Fbootstrap.git 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 --- 542e03ae3a2209b87e4db999b6ea869faf9293a9 diff --cc docs/components.html index cf504ebfa8,634b8bde07..365eeb0d6b --- a/docs/components.html +++ b/docs/components.html @@@ -167,7 -571,13 +167,13 @@@ lead: "Dozens of reusable components bu {% endhighlight %}

Justified button groups

-

Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

+

Make a group of buttons stretch at the same size to span the entire width of its parent.

- ++ +
+

Element-specific usage

+

This only works with <a> elements as the <button> doesn't pick up these styles.

+
- ++
Left @@@ -193,9 -603,9 +199,9 @@@

Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

-
+

Plugin dependency

-

Button dropdowns require the dropdown plugin to be included in your version of Bootstrap.

+

Button dropdowns require the dropdown plugin to be included in your version of Bootstrap.

Single button dropdowns

@@@ -944,9 -1354,9 +950,9 @@@ body { padding-bottom: 70px;
{% endhighlight %} -
+

Plugin dependency

-

The responsive navbar requires the collapse plugin to be included in your version of Bootstrap.

+

The responsive navbar requires the collapse plugin to be included in your version of Bootstrap.

@@@ -1452,10 -1862,16 +1458,16 @@@ -

Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

+

Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

Default alert

-

Wrap any text and an optional dismiss button in .alert for a basic warning alert message. To ensure proper behavior across all devices, be sure to use <button> element with the data-dismiss="alert" data attribute.

+

Wrap any text and an optional dismiss button in .alert for a basic warning alert message.

+ +
+

Ensure proper behavior across all devices

+

Be sure to use the <button> element with the data-dismiss="alert" data attribute.

+
+
diff --cc docs/css.html index e87abfbc0d,658f2ea9ae..e15157fba4 --- a/docs/css.html +++ b/docs/css.html @@@ -259,9 -245,9 +259,9 @@@ lead: "Fundamental HTML elements style
{% endhighlight %} -
+

Need more examples?

-

We dive into more grid layouts in a separte page, free of chrome and documentation to better show you the power of the grid.

+

We dive into more grid layouts in a separate page, free of chrome and documentation to better show you the power of the grid.

More grid examples

@@@ -1502,9 -1512,9 +1505,9 @@@ For example, <section>Adding on top of existing browser controls, Bootstrap includes other useful form components.

Input groups

-

Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with a .add-on to prepend or append elements to an <input>.

+

Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with an .add-on to prepend or append elements to an <input>.

-
+

Cross-browser compatibility

Avoid using <select> elements here as they cannot be fully styled in WebKit browsers.

diff --cc docs/customize.html index 7d2b4f2540,c91a23c14b..876d81ddee --- a/docs/customize.html +++ b/docs/customize.html @@@ -349,9 -355,14 +349,15 @@@ lead: Customize Bootstrap's components
-
-

Heads up!

-

All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

++ +
+

Produces two files

+

All checked plugins will be compiled into a readable bootstrap.js and a minified bootstrap.min.js. We recommend you use the minified version in production.

+
+ +
+

jQuery required

+

All plugins require the latest version of jQuery to be included.