rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2012-01-08 15:33:55 -08:00
commit e654ec1336
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/components.html
View File

@ -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>&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;
...

5
docs/javascript.html
View File

@ -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">&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>

3
js/bootstrap-modal.js vendored
View File

@ -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) {

4
js/bootstrap-twipsy.js vendored
View File

@ -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)