Permalink
Browse files

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

  • Loading branch information...
mdo committed Jan 8, 2012
2 parents 4b79443 + a24cdb3 commit e654ec13369761e252aa279d5e0a1002ba23cfb7
Showing with 9 additions and 5 deletions.
  1. +1 −1 docs/components.html
  2. +4 −1 docs/javascript.html
  3. +2 −1 js/bootstrap-modal.js
  4. +2 −2 js/bootstrap-twipsy.js
View
@@ -512,7 +512,7 @@ <h3>Navbar scaffolding</h3>
&lt;/div&gt;
&lt;/div&gt;
</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>&lt;body&gt;</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>&lt;body&gt;</code>.</p>
<pre class="prettyprint linenums">
&lt;div class="navbar navbar-fixed"&gt;
...
View
@@ -505,7 +505,7 @@ <h3>Demo</h3>
</div>
</section>
- <!-- Tips
+ <!-- Twipsy
================================================== -->
<section id="twipsy">
@@ -799,6 +799,9 @@ <h4>$().button('loading')</h4>
<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">&lt;button class="btn" data-loading-text="loading stuff..." &gt;...&lt;/button&gt;</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>
View
@@ -51,8 +51,9 @@
backdrop.call(this, function () {
var transition = $.support.transition && that.$element.hasClass('fade')
+ !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+
that.$element
- .appendTo(document.body)
.show()
if (transition) {
View
@@ -88,8 +88,8 @@
if (!self.options.delay || !self.options.delay.hide) {
self.hide()
} else {
+ self.hoverState = 'out'
setTimeout(function() {
- self.hoverState = 'out'
if (self.hoverState == 'out') {
self.hide()
}
@@ -123,7 +123,7 @@
$tip
.remove()
.css({ top: 0, left: 0, display: 'block' })
- .prependTo(inside ? this.$element : document.body)
+ .appendTo(inside ? this.$element : document.body)
pos = this.getPosition(inside)

0 comments on commit e654ec1

Please sign in to comment.