From 242d92e09c60396bad0837581a9692bf7abe8aea Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 20:18:30 -0700 Subject: [PATCH 1/4] Fix #8287 --- docs/components.html | 5 +++++ docs/css.html | 6 +++++- docs/javascript.html | 13 +++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/components.html b/docs/components.html index 55f27cbc33..bbb2c0f557 100644 --- a/docs/components.html +++ b/docs/components.html @@ -482,6 +482,11 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na

Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

+
+

Tooltips & popovers in button groups require special setting

+

When using tooltips or popovers on elements within a .btn-group, you'll have to specify the option container: 'body' to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).

+
+

Basic button group

Wrap a series of buttons with .btn in .btn-group.

diff --git a/docs/css.html b/docs/css.html index 2f7d747085..8e7b57d379 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1494,12 +1494,16 @@ For example, <section> should be wrapped as inline.

Adding on top of existing browser controls, Bootstrap includes other useful form components.

Input groups

-

Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with a .add-on to prepend or append elements to an <input>.

+

Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with an .add-on to prepend or append elements to an <input>.

Cross-browser compatibility

Avoid using <select> elements here as they cannot be fully styled in WebKit browsers.

+
+

Tooltips & popovers in input groups require special setting

+

When using tooltips or popovers on elements within an .input-group, you'll have to specify the option container: 'body' to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).

+
diff --git a/docs/javascript.html b/docs/javascript.html index 9a5a5b6f06..2580d9a6e1 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -744,9 +744,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
- -

Tooltips in input groups

-

When using tooltips and popovers with the Bootstrap input groups, you'll have to set the container (documented below) option to avoid unwanted side effects.

+
+

Tooltips in button groups and input groups require special setting

+

When using tooltips on elements within a .btn-group or an .input-group, you'll have to specify the option container: 'body' (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip is triggered).

+
@@ -873,6 +874,10 @@ $('#example').tooltip(options)

Plugin dependency

Popovers require the tooltip plugin to be included in your version of Bootstrap.

+
+

Popovers in button groups and input groups require special setting

+

When using popovers on elements within a .btn-group or an .input-group, you'll have to specify the option container: 'body' (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).

+

Static popover

Four options are available: top, right, bottom, and left aligned.

@@ -1004,7 +1009,7 @@ $('#example').tooltip(options) string | false false -

Appends the popover to a specific element container: 'body'

+

Appends the popover to a specific element. Example: container: 'body'

From 5e29c42211538e1e3885dc8c70779a17221c9569 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:38:00 -0700 Subject: [PATCH 2/4] remove custom url in jekyll --- _config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.yml b/_config.yml index d999358724..ddef7b2b9e 100644 --- a/_config.yml +++ b/_config.yml @@ -9,4 +9,3 @@ permalink: pretty source: ./docs destination: ./_gh_pages port: 9001 -url: http://getbootstrap.dev:9001 From c9ccbd2cf0b5b37fe67e55a93223d4836f22da44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:43:29 -0700 Subject: [PATCH 3/4] Fixes #8329: add `!important` to `.hidden` --- less/responsive-utilities.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 65fdc3d133..ef80be7a9b 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -29,8 +29,8 @@ // Hide from screenreaders and browsers // Credit: HTML5 Boilerplate .hidden { - display: none; - visibility: hidden; + display: none !important; + visibility: hidden !important; } // Visibility utilities From cb483b67589df7ac3ece33303b8ce944b3ac4b0e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:45:08 -0700 Subject: [PATCH 4/4] Add parens so sublime picks up on syntax highlighting --- less/responsive-utilities.less | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index ef80be7a9b..21e5d7556d 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -37,17 +37,17 @@ // For Phones .visible-sm { - .responsive-visibility; + .responsive-visibility(); } .visible-md { display: none !important; } .visible-lg { display: none !important; } .hidden-sm { display: none !important; } .hidden-md { - .responsive-visibility; + .responsive-visibility(); } .hidden-lg { - .responsive-visibility; + .responsive-visibility(); } @@ -55,16 +55,16 @@ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { .visible-sm { display: none !important; } .visible-md { - .responsive-visibility; + .responsive-visibility(); } .visible-lg { display: none !important; } .hidden-sm { - .responsive-visibility; + .responsive-visibility(); } .hidden-md { display: none !important; } .hidden-lg { - .responsive-visibility; + .responsive-visibility(); } } @@ -73,14 +73,14 @@ .visible-sm { display: none !important; } .visible-md { display: none !important; } .visible-lg { - .responsive-visibility; + .responsive-visibility(); } .hidden-sm { - .responsive-visibility; + .responsive-visibility(); } .hidden-md { - .responsive-visibility; + .responsive-visibility(); } .hidden-lg { display: none !important; } } @@ -91,7 +91,7 @@ @media print { .visible-print { - .responsive-visibility; + .responsive-visibility(); } .hidden-print { display: none !important; } }