diff options
| author | Mark Otto <[email protected]> | 2012-01-08 15:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-08 15:33:55 -0800 |
| commit | e654ec13369761e252aa279d5e0a1002ba23cfb7 (patch) | |
| tree | efeac31cadc20c9192ade650bf6f945069b2d23a /docs | |
| parent | 4b79443bba6ad83d9da62e00765ef45121fb39ff (diff) | |
| parent | a24cdb3e408f23de64e33642efbda7e8f7d3f2b8 (diff) | |
| download | bootstrap-e654ec13369761e252aa279d5e0a1002ba23cfb7.tar.xz bootstrap-e654ec13369761e252aa279d5e0a1002ba23cfb7.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index 0c70ef168..104bedf54 100644 --- a/docs/components.html +++ b/docs/components.html @@ -512,7 +512,7 @@ </div> </div> </pre> - <p>To make the navbar fixed, swamp the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p> + <p>To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p> <pre class="prettyprint linenums"> <div class="navbar navbar-fixed"> ... diff --git a/docs/javascript.html b/docs/javascript.html index a46813ad8..63a51dc43 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -505,7 +505,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </div> </section> - <!-- Tips + <!-- Twipsy ================================================== --> <section id="twipsy"> @@ -799,6 +799,9 @@ $('#my-alert').bind('closed', function () { <p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>. </p> <pre class="prettyprint linenums"><button class="btn" data-loading-text="loading stuff..." >...</button></pre> + <p> + <span class="label notice">Notice</span> Firefox persists the disabled state across page loads. A workaround for this is to use: <code>autocomplete="off"</code>. More info can be found <a href="https://github.com/twitter/bootstrap/issues/793">here</a>. + </p> <h4>$().button('reset')</h4> <p>Resets button state - swaps text to original text.</p> <h4>$().button(string)</h4> |