diff options
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/css/code.html | 2 | ||||
| -rw-r--r-- | docs/_includes/footer.html | 2 | ||||
| -rw-r--r-- | docs/_includes/getting-started/browser-device-support.html | 2 | ||||
| -rw-r--r-- | docs/_includes/getting-started/download.html | 5 | ||||
| -rw-r--r-- | docs/_includes/getting-started/template.html | 2 | ||||
| -rw-r--r-- | docs/_includes/getting-started/whats-included.html | 2 | ||||
| -rw-r--r-- | docs/_includes/js/affix.html | 7 | ||||
| -rw-r--r-- | docs/_includes/js/popovers.html | 74 | ||||
| -rw-r--r-- | docs/_includes/js/tooltips.html | 38 |
9 files changed, 72 insertions, 62 deletions
diff --git a/docs/_includes/css/code.html b/docs/_includes/css/code.html index 0d1396145..6e15b4c56 100644 --- a/docs/_includes/css/code.html +++ b/docs/_includes/css/code.html @@ -16,7 +16,7 @@ For example, <code><section></code> should be wrapped as inline. To switch directories, type <kbd>cd</kbd> followed by the name of the directory. </div> {% highlight html %} - To switch directories, type <kbd>cd</kbd> followed by the name of the directory. +To switch directories, type <kbd>cd</kbd> followed by the name of the directory. {% endhighlight %} <h2 id="code-block">Basic block</h2> diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 6d626a198..0bb3eafd3 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -32,7 +32,7 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="../dist/js/bootstrap.min.js"></script> <script src="../assets/js/docs.min.js"></script> {% if page.slug == "customize" %} diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html index a799bbb96..1a1236440 100644 --- a/docs/_includes/getting-started/browser-device-support.html +++ b/docs/_includes/getting-started/browser-device-support.html @@ -173,7 +173,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { <h3 id="support-android-stock-browser">Android stock browser</h3> <p>Out of the box, Android 4.1 (and even some newer releases apparently) ship with the Browser app as the default web browser of choice (as opposed to Chrome). Unfortunately, the Browser app has lots of bugs and inconsistencies with CSS in general.</p> <h4>Select menus</h4> - <p>On <code><select></code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. Use the snippet of code below to remove the offending CSS and render the <code><select></code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p> + <p>On <code><select></code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. (See <a href="http://stackoverflow.com/questions/14744437/html-select-box-not-showing-drop-down-arrow-on-android-version-4-0-when-set-with">this StackOverflow question</a> for details.) Use the snippet of code below to remove the offending CSS and render the <code><select></code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p> {% highlight html %} <script> $(function () { diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index b457d038e..bb0537796 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -13,7 +13,7 @@ </div> <div class="col-sm-4"> <h3 id="download-source">Source code</h3> - <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p> + <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="#grunt">some setup.</a></strong></p> <p> <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a> </p> @@ -33,9 +33,6 @@ <!-- Latest compiled and minified CSS --> <link rel="stylesheet" href="{{ site.cdn.css }}"> -<!-- RTL (right-to-left) version of CSS --> -<link rel="stylesheet" href="{{ site.cdn.css_rtl }}"> - <!-- Optional theme --> <link rel="stylesheet" href="{{ site.cdn.css_theme }}"> diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html index c3b1560aa..3952621a6 100644 --- a/docs/_includes/getting-started/template.html +++ b/docs/_includes/getting-started/template.html @@ -27,7 +27,7 @@ <h1>Hello, world!</h1> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <!-- Include all compiled plugins (below), or include individual files as needed --> <script src="js/bootstrap.min.js"></script> </body> diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html index 278ebac60..8500e573c 100644 --- a/docs/_includes/getting-started/whats-included.html +++ b/docs/_includes/getting-started/whats-included.html @@ -17,8 +17,6 @@ bootstrap/ ├── css/ │ ├── bootstrap.css │ ├── bootstrap.min.css -│ ├── bootstrap-rtl.css -│ ├── bootstrap-rtl.min.css │ ├── bootstrap-theme.css │ └── bootstrap-theme.min.css ├── js/ diff --git a/docs/_includes/js/affix.html b/docs/_includes/js/affix.html index cfd32ec35..5b6fec0bb 100644 --- a/docs/_includes/js/affix.html +++ b/docs/_includes/js/affix.html @@ -62,6 +62,13 @@ <td>10</td> <td>Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and bottom directions. To provide a unique, bottom and top offset just provide an object <code>offset: { top: 10 }</code> or <code>offset: { top: 10, bottom: 5 }</code>. Use a function when you need to dynamically calculate an offset.</td> </tr> + <tr> + <td>target</td> + <td>selector | node | jQuery element</td> + <td>the <code>window</code> object</td> + <td>Specifies the target element of the affix.</td> + </tr> + </tbody> </table> </div><!-- /.table-responsive --> diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index b2f58fbc4..2ee670741 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -152,6 +152,33 @@ $('.popover-dismiss').popover({ <td>Apply a CSS fade transition to the popover</td> </tr> <tr> + <td>container</td> + <td>string | false</td> + <td>false</td> + <td> + <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p> + </td> + </tr> + <tr> + <td>content</td> + <td>string | function</td> + <td>''</td> + <td> + <p>Default content value if <code>data-content</code> attribute isn't present.</p> + <p>If a function is given, it will be called with 1 argument, which is the element that the popover is attached to.</p> + </td> + </tr> + <tr> + <td>delay</td> + <td>number | object</td> + <td>0</td> + <td> + <p>Delay showing and hiding the popover (ms) - does not apply to manual trigger type</p> + <p>If a number is supplied, delay is applied to both hide/show</p> + <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> + </td> + </tr> + <tr> <td>html</td> <td>boolean</td> <td>false</td> @@ -170,21 +197,9 @@ $('.popover-dismiss').popover({ <td>If a selector is provided, popover objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td> </tr> <tr> - <td>trigger</td> - <td>string</td> - <td>'click'</td> - <td>How popover is triggered - click | hover | focus | manual</td> - </tr> - <tr> - <td>title</td> - <td>string | function</td> - <td>''</td> - <td>Default title value if <code>title</code> attribute isn't present</td> - </tr> - <tr> <td>template</td> <td>string</td> - <td><code>'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'</code></td> + <td><code>'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'</code></td> <td> <p>Base HTML to use when creating the popover.</p> <p>The popover's <code>title</code> will be injected into the <code>.popover-title</code>.</p> @@ -194,32 +209,25 @@ $('.popover-dismiss').popover({ </td> </tr> <tr> - <td>content</td> + <td>title</td> <td>string | function</td> <td>''</td> - <td> - <p>Default content value if <code>data-content</code> attribute isn't present.</p> - <p>If a function is given, it will be called with 1 argument, which is the element that the popover is attached to.</p> - </td> + <td>Default title value if <code>title</code> attribute isn't present</td> </tr> <tr> - <td>delay</td> - <td>number | object</td> - <td>0</td> - <td> - <p>Delay showing and hiding the popover (ms) - does not apply to manual trigger type</p> - <p>If a number is supplied, delay is applied to both hide/show</p> - <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> - </td> + <td>trigger</td> + <td>string</td> + <td>'click'</td> + <td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td> </tr> <tr> - <td>container</td> - <td>string | false</td> - <td>false</td> - <td> - <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p> - </td> - </tr> + <td>viewport</td> + <td>string | object</td> + <td>{ selector: 'body', padding: 0 }</td> + <td> + <p>Keeps the popover within the bounds of this element. Example: <code>viewport: '#viewport'</code> or <code>{ selector: '#viewport', padding: 0 }</code></p> + </td> + </tr> </tbody> </table> </div><!-- /.table-responsive --> diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 64ea06e85..e967878f8 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -91,6 +91,24 @@ $('#example').tooltip(options) <td>Apply a CSS fade transition to the tooltip</td> </tr> <tr> + <td>container</td> + <td>string | false</td> + <td>false</td> + <td> + <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the tooltip in the flow of the document near the triggering element - which will prevent the tooltip from floating away from the triggering element during a window resize.</p> + </td> + </tr> + <tr> + <td>delay</td> + <td>number | object</td> + <td>0</td> + <td> + <p>Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p> + <p>If a number is supplied, delay is applied to both hide/show</p> + <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> + </td> + </tr> + <tr> <td>html</td> <td>boolean</td> <td>false</td> @@ -106,7 +124,7 @@ $('#example').tooltip(options) <td>selector</td> <td>string</td> <td>false</td> - <td>If a selector is provided, tooltip objects will be delegated to the specified targets.</td> + <td>If a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have tooltips added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td> </tr> <tr> <td>template</td> @@ -132,24 +150,6 @@ $('#example').tooltip(options) <td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td> </tr> <tr> - <td>delay</td> - <td>number | object</td> - <td>0</td> - <td> - <p>Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p> - <p>If a number is supplied, delay is applied to both hide/show</p> - <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 tooltip to a specific element. Example: <code>container: 'body'</code></p> - </td> - </tr> - <tr> <td>viewport</td> <td>string | object</td> <td>{ selector: 'body', padding: 0 }</td> |