From 4d859d177a30b3d6c01e77343118f6c0246cd290 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:04:37 -0700 Subject: copyedit responsive-embed.html --- docs/_includes/components/responsive-embed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/responsive-embed.html b/docs/_includes/components/responsive-embed.html index bf65599d7..c9e0f5807 100644 --- a/docs/_includes/components/responsive-embed.html +++ b/docs/_includes/components/responsive-embed.html @@ -2,7 +2,7 @@

Responsive embed

Allow browsers to determine video or slideshow dimensions based on the width of their containing block by creating an intrinsic ratio that will properly scale on any device.

-

Rules are directly apply to <iframe>, <embed> and <object> elements, optionally use of an explicit descendant class .embed-responsive-item when you want to match the styling for other attributes.

+

Rules are directly applied to <iframe>, <embed>, and <object> elements; optionally use an explicit descendant class .embed-responsive-item when you want to match the styling for other attributes.

Pro-Tip! You don't need to include frameborder="0" in your <iframe>s as we override that for you.

-- cgit v1.2.3 From eea9eabb83a54402f0219d799e2156525d3c7709 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:12:03 -0700 Subject: fix raw source to match live example #12956 errata --- docs/_includes/css/type.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 9c5aee200..80e30cd42 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -112,7 +112,7 @@

You can use the mark tag to highlight text.

{% highlight html %} -This line of text is meant to be treated as deleted text. +You can use the mark tag to highlight text. {% endhighlight %} -- cgit v1.2.3 From 4df96c768f823106949ea07898b231ab8d40b109 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:15:27 -0700 Subject: fix description of #12956 errata --- docs/_includes/css/type.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 80e30cd42..2ea046519 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -107,7 +107,7 @@

Inline text elements

Marked text

-

For indicating blocks of text that have been deleted use the <mark> tag.

+

For highlighting a run of text due to its relevance in another context, use the <mark> tag.

You can use the mark tag to highlight text.

-- cgit v1.2.3 From d52ad3ee3ba5a0fc51e1f06abeebd888846856eb Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 17 Mar 2014 15:58:03 +0100 Subject: Separate JS includes for alerts and popovers /cc @mdo --- docs/_includes/js/alerts.html | 71 ++++++++++++++++++++++++++++++++++++++ docs/_includes/js/popovers.html | 76 ----------------------------------------- 2 files changed, 71 insertions(+), 76 deletions(-) create mode 100644 docs/_includes/js/alerts.html (limited to 'docs/_includes') diff --git a/docs/_includes/js/alerts.html b/docs/_includes/js/alerts.html new file mode 100644 index 000000000..04bbd43cf --- /dev/null +++ b/docs/_includes/js/alerts.html @@ -0,0 +1,71 @@ +
+

Alert messages alert.js

+ +

Example alerts

+

Add dismiss functionality to all alert messages with this plugin.

+
+ +
+ +
+ +
+ + +

Usage

+

Enable dismissal of an alert via JavaScript:

+ {% highlight js %}$(".alert").alert(){% endhighlight %} + +

Markup

+

Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

+ {% highlight html %}{% endhighlight %} + +

Methods

+ +

$().alert()

+

Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

+ +

.alert('close')

+

Closes an alert.

+ {% highlight js %}$(".alert").alert('close'){% endhighlight %} + + +

Events

+

Bootstrap's alert class exposes a few events for hooking into alert functionality.

+
+ + + + + + + + + + + + + + + + + +
Event TypeDescription
close.bs.alertThis event fires immediately when the close instance method is called.
closed.bs.alertThis event is fired when the alert has been closed (will wait for CSS transitions to complete).
+
+{% highlight js %} +$('#my-alert').bind('closed.bs.alert', function () { + // do something… +}) +{% endhighlight %} +
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 7bf515ad4..56e3600aa 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -263,79 +263,3 @@ $('#myPopover').on('hidden.bs.popover', function () { }) {% endhighlight %}
- - - - -
-

Alert messages alert.js

- -

Example alerts

-

Add dismiss functionality to all alert messages with this plugin.

-
- -
- -
- -
- - -

Usage

-

Enable dismissal of an alert via JavaScript:

- {% highlight js %}$(".alert").alert(){% endhighlight %} - -

Markup

-

Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

- {% highlight html %}{% endhighlight %} - -

Methods

- -

$().alert()

-

Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

- -

.alert('close')

-

Closes an alert.

- {% highlight js %}$(".alert").alert('close'){% endhighlight %} - - -

Events

-

Bootstrap's alert class exposes a few events for hooking into alert functionality.

-
- - - - - - - - - - - - - - - - - -
Event TypeDescription
close.bs.alertThis event fires immediately when the close instance method is called.
closed.bs.alertThis event is fired when the alert has been closed (will wait for CSS transitions to complete).
-
-{% highlight js %} -$('#my-alert').bind('closed.bs.alert', function () { - // do something… -}) -{% endhighlight %} -
-- cgit v1.2.3 From 1b15cefa5c5342129bec9b794946f3fb2641077d Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 17 Mar 2014 12:19:45 +0100 Subject: Generate Translations list from YAML --- docs/_includes/getting-started/translations.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/translations.html b/docs/_includes/getting-started/translations.html index dc46f5d90..215f790de 100644 --- a/docs/_includes/getting-started/translations.html +++ b/docs/_includes/getting-started/translations.html @@ -3,13 +3,9 @@

Community members have translated Bootstrap's documentation into various languages. None are officially supported and they may not always be up to date.

We don't help organize or host translations, we just link to them.

Finished a new or better translation? Open a pull request to add it to our list.

-- cgit v1.2.3 From 8534e12523c7156b53e76393cc8d016ffdcf5b4f Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 20 Jan 2014 11:54:22 -0800 Subject: Add tooltip `viewport` option, respect bounds of the viewport --- docs/_includes/js/tooltips.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 2656556be..b952e8504 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -134,6 +134,14 @@ $('#example').tooltip(options)

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

+ + viewport + string | object + { selector: 'body', padding: 0 } + +

Keeps the tooltip within the bounds of this element. Example: viewport: '#viewport' or { selector: '#viewport', padding: 0 }

+ + -- cgit v1.2.3 From 4f9270cc20c29cd3fbb0664379d620d14bb24a91 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 24 Mar 2014 09:28:40 +0200 Subject: Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests. --- docs/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/header.html b/docs/_includes/header.html index defb549ae..f11ed4baa 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -28,7 +28,7 @@ - +