Skip to content
GitLab
Commit b958ac77 authored by Mark Otto's avatar Mark Otto
Browse files

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

parents 8f09028c e27ae9c5
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 42 deletions
+42 -42
docs/base-css.html
+ 6
- 6
View file @ b958ac77
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
docs/components.html
+ 6
- 6
View file @ b958ac77
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
docs/index.html
+ 6
- 6
View file @ b958ac77
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
docs/javascript.html
+ 6
- 6
View file @ b958ac77
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
docs/less.html
+ 6
- 6
View file @ b958ac77
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
docs/scaffolding.html
+ 6
- 6
View file @ b958ac77
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
docs/upgrading.html
+ 6
- 6
View file @ b958ac77
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="./javascript.html#transition">Transition</a></li> <li><a href="./javascript.html#transitions">Transition</a></li>
<li><a href="./javascript.html#modal">Modal</a></li> <li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdown">Dropdown</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#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tab">Tab</a></li> <li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltip">Tooltip</a></li> <li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popover">Popover</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#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li> <li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li> <li><a href="./javascript.html#collapse">Collapse</a></li>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment