diff options
| author | Mark Otto <[email protected]> | 2015-04-16 18:54:17 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-04-16 18:54:17 -0700 |
| commit | 0ab1576ae227663d9e97040a486e1ca2818bab1e (patch) | |
| tree | d852285be3a39c9cc73d17bea3602a0b62c0faad /docs/getting-started | |
| parent | 605990400eb470e50bcdfd3643b8cc10f2684836 (diff) | |
| parent | 06c2862d257935871fc846670148c8767e2f6a82 (diff) | |
| download | bootstrap-0ab1576ae227663d9e97040a486e1ca2818bab1e.tar.xz bootstrap-0ab1576ae227663d9e97040a486e1ca2818bab1e.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'docs/getting-started')
| -rw-r--r-- | docs/getting-started/accessibility.md | 12 | ||||
| -rw-r--r-- | docs/getting-started/contents.md | 9 | ||||
| -rw-r--r-- | docs/getting-started/javascript.md | 9 |
3 files changed, 17 insertions, 13 deletions
diff --git a/docs/getting-started/accessibility.md b/docs/getting-started/accessibility.md index c20085ff8..47f24d8dd 100644 --- a/docs/getting-started/accessibility.md +++ b/docs/getting-started/accessibility.md @@ -9,11 +9,13 @@ Bootstrap follows common web standards and—with minimal extra effort—can be If your navigation contains many links and comes before the main content in the DOM, add a `Skip to main content` link before the navigation (for a simple explanation, see this [A11Y Project article on skip navigation links](http://a11yproject.com/posts/skip-nav-links/)). Using the `.sr-only` class will visually hide the skip link, and the <code>.sr-only-focusable</code> class will ensure that the link becomes visible once focused (for sighted keyboard users). -<div class="bs-callout bs-callout-danger" id="callout-skiplinks"> - <p>Due to long-standing shortcomings/bugs in Chrome (see <a href="https://code.google.com/p/chromium/issues/detail?id=262171" title="Chromium bug tracker - Issue 262171: Focus should cycle from named anchor">issue 262171 in the Chromium bug tracker</a>) and Internet Explorer (see this article on <a href="http://accessibleculture.org/articles/2010/05/in-page-links/">in-page links and focus order</a>), you will need to make sure that the target of your skip link is at least programmatically focusable by adding <code>tabindex="-1"</code>.</p> - <p>In addition, you may want to explicitly suppress a visible focus indication on the target (particularly as Chrome currently also sets focus on elements with <code>tabindex="-1"</code> when they are clicked with the mouse) with <code>#content:focus { outline: none; }</code>.</p> - <p>Note that this bug will also affect any other in-page links your site may be using, rendering them useless for keyboard users. You may consider adding a similar stop-gap fix to all other named anchors / fragment identifiers that act as link targets.</p> -</div> +{% callout danger %} +Due to long-standing shortcomings/bugs in Chrome (see [issue 262171 in the Chromium bug tracker](https://code.google.com/p/chromium/issues/detail?id=262171 "Chromium bug tracker - Issue 262171: Focus should cycle from named anchor")) and Internet Explorer (see this article on [in-page links and focus order](http://accessibleculture.org/articles/2010/05/in-page-links/)), you will need to make sure that the target of your skip link is at least programmatically focusable by adding `tabindex="-1"`. + +In addition, you may want to explicitly suppress a visible focus indication on the target (particularly as Chrome currently also sets focus on elements with `tabindex="-1"` when they are clicked with the mouse) with `#content:focus { outline: none; }`. + +Note that this bug will also affect any other in-page links your site may be using, rendering them useless for keyboard users. You may consider adding a similar stop-gap fix to all other named anchors / fragment identifiers that act as link targets. +{% endcallout %} {% highlight html %} <body> diff --git a/docs/getting-started/contents.md b/docs/getting-started/contents.md index 15de28618..3bfbafb4c 100644 --- a/docs/getting-started/contents.md +++ b/docs/getting-started/contents.md @@ -5,10 +5,11 @@ title: Contents Bootstrap can come in one of two forms, as precompiled or source code. Learn more about each form's contents and structure below. -<div class="bs-callout bs-callout-warning" id="jquery-required"> - <h4>jQuery required</h4> - <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="../quick-start">starter template</a>. <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p> -</div> +{% callout warning %} +#### jQuery required + +Please note that **all JavaScript plugins require jQuery** to be included, as shown in the [starter template](../quick-start). [Consult our `bower.json`]({{ site.repo }}/blob/v{{ site.current_version }}/bower.json) to see which versions of jQuery are supported. +{% endcallout %} ### Precompiled Bootstrap diff --git a/docs/getting-started/javascript.md b/docs/getting-started/javascript.md index 08576cdf7..759c2b807 100644 --- a/docs/getting-started/javascript.md +++ b/docs/getting-started/javascript.md @@ -87,10 +87,11 @@ $.fn.tooltip.Constructor.VERSION // => "{{ site.current_version }}" Bootstrap's plugins don't fall back particularly gracefully when JavaScript is disabled. If you care about the user experience in this case, use [`<noscript>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/noscript) to explain the situation (and how to re-enable JavaScript) to your users, and/or add your own custom fallbacks. -<div class="bs-callout bs-callout-warning" id="callout-third-party-libs"> - <h4>Third-party libraries</h4> - <p><strong>Bootstrap does not officially support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own.</p> -</div> +{% callout warning %} +#### Third-party libraries + +**Bootstrap does not officially support third-party JavaScript libraries** like Prototype or jQuery UI. Despite `.noConflict` and namespaced events, there may be compatibility problems that you need to fix on your own. +{% endcallout %} ## Transitions |