diff options
| author | Mark Otto <[email protected]> | 2012-01-13 09:55:43 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-13 09:55:43 -0800 |
| commit | b958ac77c122ebcf39ff7f155de7aaec2cad17b6 (patch) | |
| tree | a203ed9744e736456be2ad61292d901065b97597 | |
| parent | 8f09028cff87b68467fb20e295c9dc96ea4a5de0 (diff) | |
| parent | e27ae9c50f5e3120f3650bc6df59a0b7e396db6a (diff) | |
| download | bootstrap-b958ac77c122ebcf39ff7f155de7aaec2cad17b6.tar.xz bootstrap-b958ac77c122ebcf39ff7f155de7aaec2cad17b6.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/base-css.html | 12 | ||||
| -rw-r--r-- | docs/components.html | 12 | ||||
| -rw-r--r-- | docs/index.html | 12 | ||||
| -rw-r--r-- | docs/javascript.html | 12 | ||||
| -rw-r--r-- | docs/less.html | 12 | ||||
| -rw-r--r-- | docs/scaffolding.html | 12 | ||||
| -rw-r--r-- | docs/upgrading.html | 12 |
7 files changed, 42 insertions, 42 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 7f60580b4..9491f40aa 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -80,13 +80,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> diff --git a/docs/components.html b/docs/components.html index b9d75edbe..fa3dc5a20 100644 --- a/docs/components.html +++ b/docs/components.html @@ -80,13 +80,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> diff --git a/docs/index.html b/docs/index.html index 8d5448ce1..5d8e61ded 100644 --- a/docs/index.html +++ b/docs/index.html @@ -81,13 +81,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> diff --git a/docs/javascript.html b/docs/javascript.html index 216bcdef5..58cc13e8c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -81,13 +81,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> diff --git a/docs/less.html b/docs/less.html index 202e436e2..8831ce094 100644 --- a/docs/less.html +++ b/docs/less.html @@ -80,13 +80,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index d8ff06672..57b90d096 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -80,13 +80,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> diff --git a/docs/upgrading.html b/docs/upgrading.html index f8d9a732a..376aae856 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -80,13 +80,13 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./javascript.html#transition">Transition</a></li> - <li><a href="./javascript.html#modal">Modal</a></li> - <li><a href="./javascript.html#dropdown">Dropdown</a></li> + <li><a href="./javascript.html#transitions">Transition</a></li> + <li><a href="./javascript.html#modals">Modal</a></li> + <li><a href="./javascript.html#dropdowns">Dropdown</a></li> <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tab">Tab</a></li> - <li><a href="./javascript.html#tooltip">Tooltip</a></li> - <li><a href="./javascript.html#popover">Popover</a></li> + <li><a href="./javascript.html#tabs">Tab</a></li> + <li><a href="./javascript.html#tooltips">Tooltip</a></li> + <li><a href="./javascript.html#popovers">Popover</a></li> <li><a href="./javascript.html#alerts">Alert</a></li> <li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li> |