Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
337741fc
Commit
337741fc
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
parents
f9ee99cf
5ae1df61
3 merge requests
!6821
Typeahead updater
,
!6666
Patch 1
,
!6610
Add outline for input[type="image"]
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/javascript.html
+8
-0
docs/javascript.html
docs/templates/pages/javascript.mustache
+8
-0
docs/templates/pages/javascript.mustache
with
16 additions
and
0 deletions
+16
-0
docs/javascript.html
+
8
-
0
View file @
337741fc
...
...
@@ -1023,6 +1023,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>
Object structure is:
<code>
delay: { show: 500, hide: 100 }
</code></p>
</td>
</tr>
<tr>
<td>
container
</td>
<td>
string | false
</td>
<td>
false
</td>
<td>
<p>
Appends the popover to a specific element
<code>
container: 'body'
</code></p>
</td>
</tr>
</tbody>
</table>
<div
class=
"alert alert-info"
>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/javascript.mustache
+
8
-
0
View file @
337741fc
...
...
@@ -953,6 +953,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>
{{
_i
}}
Object structure is:
<code>
delay: { show: 500, hide: 100 }
</code>
{{/
i
}}
</p>
</td>
</tr>
<tr>
<td>
{{
_i
}}
container
{{/
i
}}
</td>
<td>
{{
_i
}}
string | false
{{/
i
}}
</td>
<td>
{{
_i
}}
false
{{/
i
}}
</td>
<td>
<p>
{{
_i
}}
Appends the popover to a specific element
<code>
container: 'body'
</code>
{{/
i
}}
</p>
</td>
</tr>
</tbody>
</table>
<div
class=
"alert alert-info"
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment