From 13e4d1d5ac90484c09ecb1a98e540309d043a6f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Apr 2012 00:35:30 -0700 Subject: [PATCH 1/7] fix #2990: text wrapping in .uneditable-input --- docs/assets/css/bootstrap.css | 2 ++ less/forms.less | 3 +++ 2 files changed, 5 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0218e595b3..e51c74e07e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -977,6 +977,8 @@ select:focus:required:invalid:focus { -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; + overflow: hidden; + white-space: nowrap; } :-moz-placeholder { color: #999999; diff --git a/less/forms.less b/less/forms.less index dd18b91f54..409de0a248 100644 --- a/less/forms.less +++ b/less/forms.less @@ -331,6 +331,9 @@ select:focus:required:invalid { border-color: #eee; .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); cursor: not-allowed; + // prevent text from wrapping, but still cut it off like an input does + overflow: hidden; + white-space: nowrap; } // Placeholder text gets special styles; can't be bundled together though for some reason From 0b8042656fc52600e18fb1c7f54dbbe8a284e737 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 16:15:32 -0700 Subject: [PATCH 2/7] fixes #2941 + whitespace in collapse --- docs/assets/js/bootstrap-alert.js | 4 ++-- docs/assets/js/bootstrap-collapse.js | 1 + js/bootstrap-alert.js | 4 ++-- js/bootstrap-collapse.js | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 167a57f841..56174955b9 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -27,7 +27,7 @@ * ====================== */ var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { + , Alert = function (el) { $(el).on('click', dismiss, this.close) } @@ -68,7 +68,7 @@ /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( option ) { + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('alert') diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 30e139cf89..41e097df31 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -60,6 +60,7 @@ if (actives && actives.length) { hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return actives.collapse('hide') hasData || actives.data('collapse', null) } diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 167a57f841..56174955b9 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -27,7 +27,7 @@ * ====================== */ var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { + , Alert = function (el) { $(el).on('click', dismiss, this.close) } @@ -68,7 +68,7 @@ /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( option ) { + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('alert') diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 30e139cf89..41e097df31 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -60,6 +60,7 @@ if (actives && actives.length) { hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return actives.collapse('hide') hasData || actives.data('collapse', null) } From d374fe92e57cc75fa3bc1e664b96ed7f2191c7e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Apr 2012 16:48:17 -0700 Subject: [PATCH 3/7] simplify the left margin for offset grid columns --- less/mixins.less | 2 +- less/tests/css-tests.html | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/less/mixins.less b/less/mixins.less index 73e6ade56d..22666b21c3 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -546,7 +546,7 @@ .offsetX (0) {} .offset (@columns) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)); } .span (@columns) { diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 8dad598c97..58e25be612 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -374,6 +374,19 @@ + +

Dropdown on a button

+
+ + +
+
@@ -445,6 +458,7 @@ + @@ -491,6 +505,8 @@ + +