From 361f452ed42d04c565de41ffca018fff5b35295c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 26 Mar 2014 12:49:15 -0700 Subject: doc that popover content() is given the element as an arg; fix #13175 --- docs/_includes/js/popovers.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 739d86bce..95868af1a 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -193,7 +193,10 @@ $('.popover-dismiss').popover({ content string | function '' - Default content value if data-content attribute isn't present + +

Default content value if data-content attribute isn't present.

+

If a function is given, it will be called with 1 argument, which is the element that the popover is attached to.

+ delay -- cgit v1.2.3 From a696d47592ef19510087113fa8e88af31a6491e0 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 27 Mar 2014 21:26:21 +0100 Subject: Change GA events to Universal Analytics --- docs/_includes/getting-started/download.html | 6 +++--- docs/_includes/nav/main.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index e3adffd8b..c89c8b9e4 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -8,21 +8,21 @@

Bootstrap

Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.

- Download Bootstrap + Download Bootstrap

Source code

Source Less, JavaScript, and font files, along with our docs. Requires a Less compiler and some setup.

- Download source + Download source

Sass

Bootstrap ported from Less to Sass for easy inclusion in Rails, Compass, or Sass-only projects.

- Download Sass + Download Sass

diff --git a/docs/_includes/nav/main.html b/docs/_includes/nav/main.html index 9f449f258..6f773d2c1 100644 --- a/docs/_includes/nav/main.html +++ b/docs/_includes/nav/main.html @@ -28,8 +28,8 @@ -- cgit v1.2.3 From b2a67ffe55f5fedb0ae1d5dff331687c3e744be0 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 27 Mar 2014 22:59:26 +0100 Subject: Revert upgrade to Universal Analytics The Google Analytics account we use cannot currently be upgraded to Universal Analytics. In order to keep using Analytics, we have to stick with Classic for now. --- docs/_includes/getting-started/download.html | 6 +++--- docs/_includes/header.html | 14 ++++++++------ docs/_includes/nav/main.html | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index c89c8b9e4..e3adffd8b 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -8,21 +8,21 @@

Bootstrap

Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.

- Download Bootstrap + Download Bootstrap

Source code

Source Less, JavaScript, and font files, along with our docs. Requires a Less compiler and some setup.

- Download source + Download source

Sass

Bootstrap ported from Less to Sass for easy inclusion in Rails, Compass, or Sass-only projects.

- Download Sass + Download Sass

diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 212981ed6..f11ed4baa 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -31,10 +31,12 @@ diff --git a/docs/_includes/nav/main.html b/docs/_includes/nav/main.html index 6f773d2c1..9f449f258 100644 --- a/docs/_includes/nav/main.html +++ b/docs/_includes/nav/main.html @@ -28,8 +28,8 @@ -- cgit v1.2.3 From e59da022308c613deae3091723d5517bdaee9e43 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 31 Mar 2014 00:00:05 -0700 Subject: add document ready jQuery wrapper in Android Browser workaround --- docs/_includes/getting-started/browser-device-support.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html index 3e1dd3e66..183bb7668 100644 --- a/docs/_includes/getting-started/browser-device-support.html +++ b/docs/_includes/getting-started/browser-device-support.html @@ -176,11 +176,13 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {

On <select> elements, the Android stock browser will not display the side controls if there is a border-radius and/or border applied. Use the snippet of code below to remove the offending CSS and render the <select> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.

{% highlight html %} {% endhighlight %}

Want to see an example? Check out this JS Bin demo.

-- cgit v1.2.3 From 11ffc7346b9a26735fe857e9b0794a5c609c1b7b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 31 Mar 2014 01:24:54 -0700 Subject: explicitly doc that icon classes should only be used on empty elements; closes #13240 --- docs/_includes/components/glyphicons.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index 6900e0dfa..0f932f45c 100644 --- a/docs/_includes/components/glyphicons.html +++ b/docs/_includes/components/glyphicons.html @@ -21,6 +21,10 @@

Don't mix with other components

Icon classes cannot be directly combined with other components. They should not be used along with other classes on the same element. Instead, add a nested <span> and apply the icon classes to the <span>.

+
+

Only for use on empty elements

+

Icon classes should only be used on elements that contain no text content and have no child elements.

+
{% highlight html %} {% endhighlight %} -- cgit v1.2.3 From 640923eb36890eb194799beeb8ec3555e2b379cc Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 1 Apr 2014 13:03:14 -0700 Subject: help avoid misuse of Carousel's .active when copy-pasting from examples; fix #13252 --- docs/_includes/js/carousel.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html index 945910c75..b0665dba8 100644 --- a/docs/_includes/js/carousel.html +++ b/docs/_includes/js/carousel.html @@ -46,6 +46,12 @@ ... +
+ ... +
+ ... +
+
... @@ -105,7 +111,7 @@ {% highlight html %} -
+
...

...

-- cgit v1.2.3 From 2d1d5754f781f0f3fa1bc296c9e69da416043c4a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 2 Apr 2014 19:55:05 -0700 Subject: document that you have to add .active yourself on prechecked btn-ized checkboxes+radios; fixes #12651 --- docs/_includes/js/buttons.html | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html index 5af374228..154320e48 100644 --- a/docs/_includes/js/buttons.html +++ b/docs/_includes/js/buttons.html @@ -37,10 +37,14 @@

Checkbox

Add data-toggle="buttons" to a group of checkboxes for checkbox style toggling on btn-group.

+
+

Pre-checked options need .active

+

For pre-checked options, you must add the .active class to the input's label yourself.

+
-
{% highlight html %}
-
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index f11ed4baa..37f7a7597 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -31,12 +31,12 @@ diff --git a/docs/_includes/nav/main.html b/docs/_includes/nav/main.html index 9f449f258..6f773d2c1 100644 --- a/docs/_includes/nav/main.html +++ b/docs/_includes/nav/main.html @@ -28,8 +28,8 @@
-- cgit v1.2.3 From d56026d489fb8db66c2db6aa0d222f1a3fa9261f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 4 Apr 2014 10:25:22 -0700 Subject: fix grammar in "Underlined text" example --- docs/_includes/css/type.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 2ea046519..da81d7414 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -146,10 +146,10 @@ You can use the mark tag to highlight text.

Underlined text

To underline text use the <u> tag.

-

This line of text is will render as underlined

+

This line of text will render as underlined

{% highlight html %} -This line of text is will render as underlined +This line of text will render as underlined {% endhighlight %}

Make use of HTML's default emphasis tags with lightweight styles.

-- cgit v1.2.3 From fce0254b2a90e99804e6433d01ca45a5378285ac Mon Sep 17 00:00:00 2001 From: Billy Matthews Date: Sat, 5 Apr 2014 18:33:57 -0400 Subject: Fixed typo in Responsive Tables CSS docs --- docs/_includes/css/tables.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html index 99db2af72..affe17ffa 100644 --- a/docs/_includes/css/tables.html +++ b/docs/_includes/css/tables.html @@ -348,7 +348,7 @@

Responsive tables

-

Create responsive tables by wrapping any .table in .table-responsive to make them scroll horizontally up to small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.

+

Create responsive tables by wrapping any .table in .table-responsive to make them scroll horizontally on small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.

-- cgit v1.2.3 From f159ce8b9ee84f885222a48c856a0f64269ba079 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Apr 2014 22:59:37 -0700 Subject: Fixes #13208: Drop for in code snippets and examples --- docs/_includes/components/navbar.html | 8 ++++---- docs/_includes/js/dropdowns.html | 12 ++++++------ docs/_includes/js/scrollspy.html | 2 +- docs/_includes/js/tabs.html | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index 8f85b73d1..02f4fbcfa 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -42,7 +42,7 @@
  • Link
  • Link
  • - Dropdown + Dropdown