From 19222bfe8962c9987aa96d7bdeb0b5f2ce1505ba Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Jan 2015 22:05:49 -0800 Subject: overview.html: add missing

--- docs/_includes/js/overview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/overview.html b/docs/_includes/js/overview.html index 4a35e8794..89030966c 100644 --- a/docs/_includes/js/overview.html +++ b/docs/_includes/js/overview.html @@ -71,7 +71,7 @@ $('#myModal').on('show.bs.modal', function (e) { {% endhighlight %}

Version numbers

- The version of each of Bootstrap's jQuery plugins can be accessed via the VERSION property of the plugin's constructor. For example, for the tooltip plugin: +

The version of each of Bootstrap's jQuery plugins can be accessed via the VERSION property of the plugin's constructor. For example, for the tooltip plugin:

{% highlight js %} $.fn.tooltip.Constructor.VERSION // => "{{ site.current_version }}" {% endhighlight %} -- cgit v1.2.3 From be6dc3a3c9ac75e9f0a730348dd960922d7aea46 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 5 Jan 2015 16:19:56 -0800 Subject: Add example of using feedback icons with .input-group ; fixes #15332 --- docs/_includes/css/forms.html | 81 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 054922703..d3b882672 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -701,6 +701,15 @@ (error) +
+ +
+ @ + +
+ + (success) +
{% highlight html %} @@ -722,6 +731,15 @@ (error) +
+ +
+ @ + +
+ + (success) +
{% endhighlight %}

Optional icons in horizontal and inline forms

@@ -735,6 +753,17 @@ (success) +
+ +
+
+ @ + +
+ + (success) +
+
{% highlight html %} @@ -747,6 +776,17 @@ (success) +
+ +
+
+ @ + +
+ + (success) +
+
{% endhighlight %} @@ -759,6 +799,18 @@ (success) +
+
+
+ +
+ @ + +
+ + (success) +
+
{% highlight html %}
@@ -769,6 +821,17 @@ (success)
+
+
+ +
+ @ + +
+ + (success) +
+
{% endhighlight %}

Optional icons with hidden .sr-only labels

@@ -780,6 +843,15 @@ (success) +
+ +
+ @ + +
+ + (success) +
{% highlight html %}
@@ -788,6 +860,15 @@ (success)
+
+ +
+ @ + +
+ + (success) +
{% endhighlight %} -- cgit v1.2.3 From 9db1de2a3aa734f41d9f5d0d1c0dfac5b77f4874 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 6 Jan 2015 12:49:31 +0200 Subject: Update jQuery to v1.11.2. --- docs/_includes/footer.html | 2 +- docs/_includes/getting-started/template.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 23eadb220..bc5cb866e 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -32,7 +32,7 @@ - + {% if site.github %} diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html index 47a0a8b67..84e009885 100644 --- a/docs/_includes/getting-started/template.html +++ b/docs/_includes/getting-started/template.html @@ -27,7 +27,7 @@

Hello, world!

- + -- cgit v1.2.3 From 901ece7996e4573daef66f265ea7c60bbcedd77e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 1 Aug 2014 13:51:28 -0700 Subject: add pointer to Masonry in the thumbnail docs --- docs/_includes/components/thumbnails.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes') diff --git a/docs/_includes/components/thumbnails.html b/docs/_includes/components/thumbnails.html index 766d79f36..530ae50fb 100644 --- a/docs/_includes/components/thumbnails.html +++ b/docs/_includes/components/thumbnails.html @@ -2,6 +2,7 @@

Thumbnails

Extend Bootstrap's grid system with the thumbnail component to easily display grids of images, videos, text, and more.

+

If you're looking for Pinterest-like presentation of thumbnails of varying heights and/or widths, you'll need to use a third-party plugin such as Masonry, Isotope, or Salvattore.

Default example

By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

-- cgit v1.2.3 From fb6622a7d44c99323bea5bd69cb0604470bbe21a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 13 Jan 2015 17:06:31 -0800 Subject: Document that calling tooltip/popover .show()/.hide() qualifies as manual triggering Fixes #15465 [skip sauce] --- docs/_includes/js/popovers.html | 6 +++--- docs/_includes/js/tooltips.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 321c93d9b..d72c78da8 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -252,15 +252,15 @@ sagittis lacus vel augue laoreet rutrum faucibus.">

Initializes popovers for an element collection.

.popover('show')

-

Reveals an element's popover. Popovers whose both title and content are zero-length are never displayed.

+

Reveals an element's popover. This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.

{% highlight js %}$('#element').popover('show'){% endhighlight %}

.popover('hide')

-

Hides an element's popover.

+

Hides an element's popover. This is considered a "manual" triggering of the popover.

{% highlight js %}$('#element').popover('hide'){% endhighlight %}

.popover('toggle')

-

Toggles an element's popover.

+

Toggles an element's popover. This is considered a "manual" triggering of the popover.

{% highlight js %}$('#element').popover('toggle'){% endhighlight %}

.popover('destroy')

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index fd6cc445d..0cf91bfb5 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -213,15 +213,15 @@ $('#example').tooltip(options)

Attaches a tooltip handler to an element collection.

.tooltip('show')

-

Reveals an element's tooltip. Tooltips with zero-length titles are never displayed.

+

Reveals an element's tooltip. This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.

{% highlight js %}$('#element').tooltip('show'){% endhighlight %}

.tooltip('hide')

-

Hides an element's tooltip.

+

Hides an element's tooltip. This is considered a "manual" triggering of the tooltip.

{% highlight js %}$('#element').tooltip('hide'){% endhighlight %}

.tooltip('toggle')

-

Toggles an element's tooltip.

+

Toggles an element's tooltip. This is considered a "manual" triggering of the tooltip.

{% highlight js %}$('#element').tooltip('toggle'){% endhighlight %}

.tooltip('destroy')

-- cgit v1.2.3 From 7b847052863c1fa26e6a9175b2decd778a640f9a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 13 Jan 2015 17:33:27 -0800 Subject: Document that .form-inline & .form-horizontal work fine on non-
s too Fixes #15555 [skip sauce] --- docs/_includes/css/forms.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 054922703..b4d01a25d 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -56,7 +56,7 @@

Inline form

-

Add .form-inline to your <form> for left-aligned and inline-block controls. This only applies to forms within viewports that are at least 768px wide.

+

Add .form-inline to your form (which doesn't have to be a <form>) for left-aligned and inline-block controls. This only applies to forms within viewports that are at least 768px wide.

Requires custom widths

Inputs and selects have width: 100%; applied by default in Bootstrap. Within inline forms, we reset that to width: auto; so multiple controls can reside on the same line. Depending on your layout, additional custom widths may be required.

@@ -130,7 +130,7 @@ {% endhighlight %}

Horizontal form

-

Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding .form-horizontal to the form. Doing so changes .form-groups to behave as grid rows, so no need for .row.

+

Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding .form-horizontal to the form (which doesn't have to be a <form>). Doing so changes .form-groups to behave as grid rows, so no need for .row.

-- cgit v1.2.3 From ccc3eb5cc608b4642196581ab1678ecfdae812a4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 14 Jan 2015 18:43:04 -0800 Subject: document usage of npm package; fixes #15127 [skip sauce] --- docs/_includes/getting-started/download.html | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index fd81a405b..7059dc6d1 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -44,6 +44,16 @@

You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using Bower:

{% highlight bash %}$ bower install bootstrap{% endhighlight %} +

Install with npm

+

You can also install Bootstrap using npm:

+ {% highlight bash %}$ npm install bootstrap{% endhighlight %} +

require('bootstrap') will load all of Bootstrap's jQuery plugins onto the jQuery object. The bootstrap module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the /js/*.js files under the package's top-level directory.

+

Bootstrap's package.json contains some additional metadata under the following keys:

+
    +
  • less - path to Bootstrap's main Less source file
    • +
  • style - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)
    • +
+

Autoprefixer required for Less/Sass

Bootstrap uses Autoprefixer to deal with CSS vendor prefixes. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.

-- cgit v1.2.3 From f1cb639c3439d2cca006ebc28f05bc694c6c4ed2 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 15 Jan 2015 10:46:58 -0800 Subject: Docs: add missing "http://" --- docs/_includes/getting-started/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index 7059dc6d1..13a56bebd 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -50,7 +50,7 @@

require('bootstrap') will load all of Bootstrap's jQuery plugins onto the jQuery object. The bootstrap module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the /js/*.js files under the package's top-level directory.

Bootstrap's package.json contains some additional metadata under the following keys:

    -
  • less - path to Bootstrap's main Less source file
    • +
  • less - path to Bootstrap's main Less source file
  • style - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)
-- cgit v1.2.3 From 63f31364508c1f18922867d5d66c4b84cdfb4db3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 15 Jan 2015 17:15:41 -0800 Subject: Document that tooltip+popover show+hide methods are async; fixes #15500 [skip sauce] --- docs/_includes/js/popovers.html | 7 ++++--- docs/_includes/js/tooltips.html | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index d72c78da8..56d8ce8b1 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -252,20 +252,21 @@ sagittis lacus vel augue laoreet rutrum faucibus.">

Initializes popovers for an element collection.

.popover('show')

-

Reveals an element's popover. This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.

+

Reveals an element's popover. Returns to the caller before the popover has actually been shown (i.e. before the shown.bs.popover event occurs). This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.

{% highlight js %}$('#element').popover('show'){% endhighlight %}

.popover('hide')

-

Hides an element's popover. This is considered a "manual" triggering of the popover.

+

Hides an element's popover. Returns to the caller before the popover has actually been hidden (i.e. before the hidden.bs.popover event occurs). This is considered a "manual" triggering of the popover.

{% highlight js %}$('#element').popover('hide'){% endhighlight %}

.popover('toggle')

-

Toggles an element's popover. This is considered a "manual" triggering of the popover.

+

Toggles an element's popover. Returns to the caller before the popover has actually been shown or hidden (i.e. before the shown.bs.popover or hidden.bs.popover event occurs). This is considered a "manual" triggering of the popover.

{% highlight js %}$('#element').popover('toggle'){% endhighlight %}

.popover('destroy')

Hides and destroys an element's popover.

{% highlight js %}$('#element').popover('destroy'){% endhighlight %} +

Events

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 0cf91bfb5..90fa37208 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -213,15 +213,15 @@ $('#example').tooltip(options)

Attaches a tooltip handler to an element collection.

.tooltip('show')

-

Reveals an element's tooltip. This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.

+

Reveals an element's tooltip. Returns to the caller before the tooltip has actually been shown (i.e. before the shown.bs.tooltip event occurs). This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.

{% highlight js %}$('#element').tooltip('show'){% endhighlight %}

.tooltip('hide')

-

Hides an element's tooltip. This is considered a "manual" triggering of the tooltip.

+

Hides an element's tooltip. Returns to the caller before the tooltip has actually been hidden (i.e. before the hidden.bs.tooltip event occurs). This is considered a "manual" triggering of the tooltip.

{% highlight js %}$('#element').tooltip('hide'){% endhighlight %}

.tooltip('toggle')

-

Toggles an element's tooltip. This is considered a "manual" triggering of the tooltip.

+

Toggles an element's tooltip. Returns to the caller before the tooltip has actually been shown or hidden (i.e. before the shown.bs.tooltip or hidden.bs.tooltip event occurs). This is considered a "manual" triggering of the tooltip.

{% highlight js %}$('#element').tooltip('toggle'){% endhighlight %}

.tooltip('destroy')

-- cgit v1.2.3 From 2fa70f37da8b250db1fc0a6d8dc4d5aba61bf0df Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 15 Jan 2015 17:44:38 -0800 Subject: Add example of using .form-inline with visible