Permalink
Browse files

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

  • Loading branch information...
2 parents 8f09028 + e27ae9c commit b958ac77c122ebcf39ff7f155de7aaec2cad17b6 @mdo mdo committed Jan 13, 2012
Showing with 42 additions and 42 deletions.
  1. +6 −6 docs/base-css.html
  2. +6 −6 docs/components.html
  3. +6 −6 docs/index.html
  4. +6 −6 docs/javascript.html
  5. +6 −6 docs/less.html
  6. +6 −6 docs/scaffolding.html
  7. +6 −6 docs/upgrading.html
View
12 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>
View
12 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>
View
12 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>
View
12 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>
View
12 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>
View
12 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>
View
12 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>

0 comments on commit b958ac7

Please sign in to comment.