diff options
| author | Rod Vagg <[email protected]> | 2011-11-06 12:41:55 +1100 |
|---|---|---|
| committer | Rod Vagg <[email protected]> | 2011-11-06 12:41:55 +1100 |
| commit | 3628eb79ae42ca1c398d190ca5e96108f3cd353b (patch) | |
| tree | 76b8a76a77bdfe28171712e73290523618d8dd39 | |
| parent | f6a258ef36c0e9383b35e8f33cda14ba4718e0f3 (diff) | |
| parent | c3c700fd02dc1fbd096bd5926960dd9b80b8169d (diff) | |
| download | bootstrap-3628eb79ae42ca1c398d190ca5e96108f3cd353b.tar.xz bootstrap-3628eb79ae42ca1c398d190ca5e96108f3cd353b.zip | |
Merge branch 'master' into poveropt
| -rw-r--r-- | bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | js/bootstrap-twipsy.js | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/forms.less | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/bootstrap.css b/bootstrap.css index eb4b824d3..ac267a028 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Nov 4 13:44:15 PDT 2011 + * Date: Sat Nov 5 17:07:48 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/docs/index.html b/docs/index.html index ff79f84f4..f22db0e60 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2024,7 +2024,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita <!-- Le javascript --> - <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script> + <script src="http://code.jquery.com/jquery-1.7.min.js"></script> <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> <script>$(function () { prettyPrint() })</script> diff --git a/docs/javascript.html b/docs/javascript.html index 9176ff698..82dcffba7 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le javascript --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script> + <script src="http://code.jquery.com/jquery-1.7.min.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> <script>$(function () { prettyPrint() })</script> <script src="../js/bootstrap-modal.js"></script> diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 7f8ad0fed..e249c815d 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -168,10 +168,7 @@ } , tip: function() { - if (!this.$tip) { - this.$tip = $('<div class="twipsy" />').html(this.options.template) - } - return this.$tip + return this.$tip = this.$tip || $('<div class="twipsy" />').html(this.options.template) } , validate: function() { @@ -194,6 +191,10 @@ this.enabled = !this.enabled } + , toggle: function () { + this[this.tip().hasClass('in') ? 'hide' : 'show']() + } + } diff --git a/lib/forms.less b/lib/forms.less index 06bd5b3a5..87fcc3d1a 100644..100755 --- a/lib/forms.less +++ b/lib/forms.less @@ -184,7 +184,7 @@ select:focus { border-color: @borderColor; &:focus { border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%); + .box-shadow(0 0 6px lighten(@borderColor, 20%)); } } // Give a small background color for input-prepend/-append |