aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-04-16 16:56:40 -0700
committerMark Otto <[email protected]>2015-04-16 16:56:40 -0700
commit466d36e54175ee00927d6518d9481acd2d210590 (patch)
treeb24687c6657e786c372a4467d059ca064b590dbb /docs/javascript
parent801d49fb32ffe03a9cc9fd4225896d747b37a0a5 (diff)
downloadbootstrap-466d36e54175ee00927d6518d9481acd2d210590.tar.xz
bootstrap-466d36e54175ee00927d6518d9481acd2d210590.zip
Redo all our callouts with the custom callout plugin
- Replaces manual use of .bd-callout with {% callout [type] %} - Rearranged some callouts for proximity to others - Turned long lists of callouts--like those on tooltips, plugings, etc--into a list because holy shit that's overwhelming
Diffstat (limited to 'docs/javascript')
-rw-r--r--docs/javascript/buttons.md47
-rw-r--r--docs/javascript/tabs.md9
2 files changed, 32 insertions, 24 deletions
diff --git a/docs/javascript/buttons.md b/docs/javascript/buttons.md
index 92580efce..2a8e4ccd1 100644
--- a/docs/javascript/buttons.md
+++ b/docs/javascript/buttons.md
@@ -6,19 +6,22 @@ title: Buttons
Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
-<div class="bd-callout bd-callout-danger">
- <h4>Cross-browser compatibility</h4>
- <p><a href="https://github.com/twbs/bootstrap/issues/793">Firefox persists form control states (disabledness and checkedness) across page loads</a>. A workaround for this is to use <code>autocomplete="off"</code>. See <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=654072">Mozilla bug #654072</a>.</p>
-</div>
+{% callout danger %}
+#### Cross-browser compatibility
+
+[Firefox persists form control states (disabledness and checkedness) across page loads](https://github.com/twbs/bootstrap/issues/793). A workaround for this is to use `autocomplete="off"`. See [Mozilla bug #654072](https://bugzilla.mozilla.org/show_bug.cgi?id=654072).
+{% endcallout %}
+
## Stateful
Add `data-loading-text="Loading..."` to use a loading state on a button.
-<div class="bd-callout bd-callout-info">
- <h4>Use whichever state you like!</h4>
- <p>For the sake of this demonstration, we are using <code>data-loading-text</code> and <code>$().button('loading')</code>, but that's not the only state you can use. <a href="#buttons-methods">See more on this below in the <code>$().button(string)</code> documentation</a>.</p>
-</div>
+{% callout info %}
+#### Use whichever state you like!
+
+For the sake of this demonstration, we are using `data-loading-text` and `$().button('loading')`, but that's not the only state you can use. [See more on this below in the `$().button(string)` documentation](#buttons-methods).
+{% endcallout %}
{% example html %}
<button type="button" id="myButton" data-loading-text="Loading..." class="btn btn-primary" autocomplete="off">
@@ -43,23 +46,27 @@ Add `data-toggle="button"` to activate toggling on a single button.
</button>
{% endexample %}
-<div class="bd-callout bd-callout-warning">
- <h4>Pre-toggled buttons need <code>.active</code> and <code>aria-pressed="true"</code></h4>
- <p>For pre-toggled buttons, you must add the <code>.active</code> class and the <code>aria-pressed="true"</code> attribute to the <code>button</code> yourself.</p>
-</div>
+{% callout warning %}
+#### Pre-toggled buttons need `.active` and `aria-pressed="true"`
+
+For pre-toggled buttons, you must add the `.active` class and the `aria-pressed="true"` attribute to the `button` yourself.
+{% endcallout %}
## Checkbox and radio
Add `data-toggle="buttons"` to a `.btn-group` containing checkbox or radio inputs to enable toggling in their respective styles.
-<div class="bd-callout bd-callout-warning">
- <h4>Preselected options need <code>.active</code></h4>
- <p>For preselected options, you must add the <code>.active</code> class to the input's <code>label</code> yourself.</p>
-</div>
-<div class="bd-callout bd-callout-warning">
- <h4>Visual checked state only updated on click</h4>
- <p>If the checked state of a checkbox button is updated without firing a <code>click</code> event on the button (e.g. via <code>&lt;input type="reset"&gt;</code> or via setting the <code>checked</code> property of the input), you will need to toggle the <code>.active</code> class on the input's <code>label</code> yourself.</p>
-</div>
+{% callout warning %}
+#### Preselected options need `.active`
+
+For preselected options, you must add the `.active` class to the input's `label` yourself.
+{% endcallout %}
+
+{% callout warning %}
+#### Visual checked state only updated on click
+
+If the checked state of a checkbox button is updated without firing a `click` event on the button (e.g. via `<input type="reset">` or via setting the `checked` property of the input), you will need to toggle the `.active` class on the input's `label` yourself.
+{% endcallout %}
{% example html %}
<div class="bd-example">
diff --git a/docs/javascript/tabs.md b/docs/javascript/tabs.md
index b526cfd2e..141c88dc7 100644
--- a/docs/javascript/tabs.md
+++ b/docs/javascript/tabs.md
@@ -42,10 +42,11 @@ Add quick, dynamic tab functionality to transition through panes of local conten
</div>
</div>
-<div class="bd-callout bd-callout-info">
- <h4>Extends tabbed navigation</h4>
- <p>This plugin extends the <a href="../components/#nav-tabs">tabbed navigation component</a> to add tabbable areas.</p>
-</div>
+{% callout info %}
+#### Extends tabbed navigation
+
+This plugin extends the [tabbed navigation component](../components/#nav-tabs) to add tabbable areas.
+{% endcallout %}
## Usage