From c53347db79b190b9af67fa145be92def2862c9a1 Mon Sep 17 00:00:00 2001 From: Julian Birch Date: Sat, 5 Nov 2011 04:25:31 +0000 Subject: [PATCH 1/3] Add a missing bracket back in. (Prevents dotLess from compiling.) --- lib/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 lib/forms.less diff --git a/lib/forms.less b/lib/forms.less old mode 100644 new mode 100755 index 06bd5b3a58..87fcc3d1a3 --- 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 From f03679805e843674736dd84ae165f96b2d6983e5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 5 Nov 2011 17:06:41 -0700 Subject: [PATCH 2/3] update to jquery 1.7 + add toggle method to twipsy/popover --- bootstrap.css | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- js/bootstrap-twipsy.js | 9 +++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index eb4b824d32..99b0198443 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:05:04 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 ff79f84f40..f22db0e604 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2024,7 +2024,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita - + diff --git a/docs/javascript.html b/docs/javascript.html index 9176ff6980..82dcffba75 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ - + diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 7f8ad0fed8..e249c815d7 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -168,10 +168,7 @@ } , tip: function() { - if (!this.$tip) { - this.$tip = $('
').html(this.options.template) - } - return this.$tip + return this.$tip = this.$tip || $('
').html(this.options.template) } , validate: function() { @@ -194,6 +191,10 @@ this.enabled = !this.enabled } + , toggle: function () { + this[this.tip().hasClass('in') ? 'hide' : 'show']() + } + } From c3c700fd02dc1fbd096bd5926960dd9b80b8169d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 5 Nov 2011 17:07:55 -0700 Subject: [PATCH 3/3] rebuild --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 99b0198443..ac267a0284 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: Sat Nov 5 17:05:04 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).