mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
Merge branch 'master' of https://github.com/Synchro/bootstrap into Synchro-master
This commit is contained in:
Mark Otto
commit
d839bf961b
Binary file not shown.
4
docs/assets/css/bootstrap-responsive.css
vendored
4
docs/assets/css/bootstrap-responsive.css
vendored
@ -169,9 +169,9 @@
|
||||
width: 100%;
|
||||
min-height: 28px;
|
||||
/* Make inputs at least the height of their button counterpart */
|
||||
|
||||
|
||||
/* Makes inputs behave like true block-level elements */
|
||||
|
||||
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
-ms-box-sizing: border-box;
|
||||
|
||||
@ -609,7 +609,7 @@ $('#myModal').on('hidden', function () {
|
||||
<div class="span9 columns">
|
||||
<h2>Example tabs</h2>
|
||||
<p>Click the tabs below to toggle between hidden panes, even via dropdown menus.</p>
|
||||
<ul id="tab" class="nav nav-tabs">
|
||||
<ul id="myTab" class="nav nav-tabs">
|
||||
<li class="active"><a href="#home" data-toggle="tab">Home</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li class="dropdown">
|
||||
@ -636,10 +636,21 @@ $('#myModal').on('hidden', function () {
|
||||
</div>
|
||||
<hr>
|
||||
<h2>Using bootstrap-tab.js</h2>
|
||||
<p>Enable tabbable tabs via javascript:</p>
|
||||
<pre class="prettyprint linenums">$('#myTab').tab('show')</pre>
|
||||
<p>Enable tabbable tabs via javascript (each tab needs to be activated individually):</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myTab a').click(function (e) {
|
||||
e.preventDefault();
|
||||
$(this).tab('show');
|
||||
})</pre>
|
||||
<p>You can activate individual tabs in several ways:</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myTab a[href="#profile"]').tab('show'); //Select tab by name
|
||||
$('#myTab a:first').tab('show'); //Select first tab
|
||||
$('#myTab a:last').tab('show'); //Select last tab
|
||||
$('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
|
||||
</pre>
|
||||
<h3>Markup</h3>
|
||||
<p>You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element.</p>
|
||||
<p>You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the bootstrap tab styling.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav nav-tabs">
|
||||
<li><a href="#home" data-toggle="tab">Home</a></li>
|
||||
@ -653,7 +664,7 @@ $('#myModal').on('hidden', function () {
|
||||
Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
|
||||
</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav nav-tabs">
|
||||
<ul class="nav nav-tabs" id="myTab">
|
||||
<li class="active"><a href="#home">Home</a></li>
|
||||
<li><a href="#profile">Profile</a></li>
|
||||
<li><a href="#messages">Messages</a></li>
|
||||
@ -669,7 +680,7 @@ $('#myModal').on('hidden', function () {
|
||||
|
||||
<script>
|
||||
$(function () {
|
||||
$('.tabs a:last').tab('show')
|
||||
$('#myTab a:last').tab('show')
|
||||
})
|
||||
</script></pre>
|
||||
<h3>Events</h3>
|
||||
@ -893,7 +904,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
||||
</div>
|
||||
<h3>Markup</h3>
|
||||
<p>
|
||||
For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
|
||||
For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
|
||||
</p>
|
||||
<h3>Methods</h3>
|
||||
<h4>$().popover(options)</h4>
|
||||
|
||||
25
docs/templates/pages/javascript.mustache
vendored
25
docs/templates/pages/javascript.mustache
vendored
@ -533,7 +533,7 @@ $('#myModal').on('hidden', function () {
|
||||
<div class="span9 columns">
|
||||
<h2>{{_i}}Example tabs{{/i}}</h2>
|
||||
<p>{{_i}}Click the tabs below to toggle between hidden panes, even via dropdown menus.{{/i}}</p>
|
||||
<ul id="tab" class="nav nav-tabs">
|
||||
<ul id="myTab" class="nav nav-tabs">
|
||||
<li class="active"><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">{{_i}}Profile{{/i}}</a></li>
|
||||
<li class="dropdown">
|
||||
@ -560,10 +560,21 @@ $('#myModal').on('hidden', function () {
|
||||
</div>
|
||||
<hr>
|
||||
<h2>{{_i}}Using bootstrap-tab.js{{/i}}</h2>
|
||||
<p>{{_i}}Enable tabbable tabs via javascript:{{/i}}</p>
|
||||
<pre class="prettyprint linenums">$('#myTab').tab('show')</pre>
|
||||
<p>{{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myTab a').click(function (e) {
|
||||
e.preventDefault();
|
||||
$(this).tab('show');
|
||||
})</pre>
|
||||
<p>{{_i}}You can activate individual tabs in several ways:{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myTab a[href="#profile"]').tab('show'); //Select tab by name
|
||||
$('#myTab a:first').tab('show'); //Select first tab
|
||||
$('#myTab a:last').tab('show'); //Select last tab
|
||||
$('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
|
||||
</pre>
|
||||
<h3>{{_i}}Markup{{/i}}</h3>
|
||||
<p>{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element.{{/i}}</p>
|
||||
<p>{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the bootstrap tab styling.{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav nav-tabs">
|
||||
<li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
|
||||
@ -577,7 +588,7 @@ $('#myModal').on('hidden', function () {
|
||||
{{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}}
|
||||
</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav nav-tabs">
|
||||
<ul class="nav nav-tabs" id="myTab">
|
||||
<li class="active"><a href="#home">{{_i}}Home{{/i}}</a></li>
|
||||
<li><a href="#profile">{{_i}}Profile{{/i}}</a></li>
|
||||
<li><a href="#messages">{{_i}}Messages{{/i}}</a></li>
|
||||
@ -593,7 +604,7 @@ $('#myModal').on('hidden', function () {
|
||||
|
||||
<script>
|
||||
$(function () {
|
||||
$('.tabs a:last').tab('show')
|
||||
$('#myTab a:last').tab('show')
|
||||
})
|
||||
</script></pre>
|
||||
<h3>{{_i}}Events{{/i}}</h3>
|
||||
@ -817,7 +828,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
||||
</div>
|
||||
<h3>{{_i}}Markup{{/i}}</h3>
|
||||
<p>
|
||||
{{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.{{/i}}
|
||||
{{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}
|
||||
</p>
|
||||
<h3>{{_i}}Methods{{/i}}</h3>
|
||||
<h4>$().popover({{_i}}options{{/i}})</h4>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user