diff --git a/README.md b/README.md index 0ab28db0db..977e9252d8 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ Keep track of development and community news. - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). +- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/twbs-bootstrap) or similar delivery mechanisms for maximum discoverability. diff --git a/docs/_includes/components/button-dropdowns.html b/docs/_includes/components/button-dropdowns.html index e63e9eedd0..1e707c4bac 100644 --- a/docs/_includes/components/button-dropdowns.html +++ b/docs/_includes/components/button-dropdowns.html @@ -8,7 +8,7 @@

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

-

Single button dropdowns

+

Single button dropdowns

Turn a button into a dropdown toggle with some basic markup changes.

@@ -88,7 +88,7 @@
{% endhighlight %} -

Split button dropdowns

+

Split button dropdowns

Similarly, create split button dropdowns with the same markup changes, only with a separate button.

@@ -194,7 +194,7 @@
{% endhighlight %} -

Sizing

+

Sizing

Button dropdowns work with buttons of all sizes.

{% endhighlight %} -

Dropup variation

+

Dropup variation

Trigger dropdown menus above elements by adding .dropup to the parent.

-

Basic example

+

Basic example

Wrap a series of buttons with .btn in .btn-group.

@@ -32,7 +32,7 @@
{% endhighlight %} -

Button toolbar

+

Button toolbar

Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

{% endhighlight %} -

Sizing

+

Sizing

Instead of applying button sizing classes to every button in a group, just add .btn-group-* to each .btn-group, including when nesting multiple groups.

@@ -94,7 +94,7 @@
...
{% endhighlight %} -

Nesting

+

Nesting

Place a .btn-group within another .btn-group when you want dropdown menus mixed with a series of buttons.

@@ -131,7 +131,7 @@
{% endhighlight %} -

Vertical variation

+

Vertical variation

Make a set of buttons appear vertically stacked rather than horizontally. Split button dropdowns are not supported here.

@@ -187,7 +187,7 @@
{% endhighlight %} -

Justified button groups

+

Justified button groups

Make a group of buttons stretch at equal sizes to span the entire width of its parent. Also works with button dropdowns within the button group.

diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index 1c0a3c5a25..2ad2692827 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -3,7 +3,7 @@

Toggleable, contextual menu for displaying lists of links. Made interactive with the dropdown JavaScript plugin.

- +

Wrap the dropdown's trigger and the dropdown menu within .dropdown, or another element that declares position: relative;. Then add the menu's HTML. Dropdown menus can be changed to expand upwards (instead of downwards) by adding .dropup to the parent.

{% endhighlight %} - +

By default, a dropdown menu is automatically positioned 100% from the top and along the left side of its parent. Add .dropdown-menu-right to a .dropdown-menu to right align the dropdown menu.

May require additional positioning

@@ -72,7 +72,7 @@ {% endhighlight %} - +

Add a header to label sections of actions in any dropdown menu.