From 4d153b912587ef8a8dc77ba67557ea70db757bee Mon Sep 17 00:00:00 2001 From: fyquah95 Date: Wed, 1 Apr 2015 17:43:32 +0800 Subject: indented javascript/modal/using-grid-system sample code from 4 spaces to 2 spaces --- docs/_includes/js/modal.html | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/modal.html b/docs/_includes/js/modal.html index 92adb3af5..59fc80dae 100644 --- a/docs/_includes/js/modal.html +++ b/docs/_includes/js/modal.html @@ -270,47 +270,47 @@ $('#myModal').on('shown.bs.modal', function () { {% highlight html %}

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

-- cgit v1.2.3 From 85235c55acffd1f3f2d2cdd0414828b21aa070b7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 2 May 2015 13:01:55 -0700 Subject: Document Affix plugin's `checkPosition` method Fixes #16361 Refs #16356 [skip sauce] --- docs/_includes/js/affix.html | 13 +++++++++++++ docs/_includes/nav/javascript.html | 1 + 2 files changed, 14 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/js/affix.html b/docs/_includes/js/affix.html index c94efc03f..bdd896b82 100644 --- a/docs/_includes/js/affix.html +++ b/docs/_includes/js/affix.html @@ -74,6 +74,19 @@ $('#myAffix').affix({ +

Methods

+ +

.affix(options)

+

Activates your content as affixed content. Accepts an optional options object.

+{% highlight js %} +$('#myAffix').affix({ + offset: 15 +}) +{% endhighlight %} + +

.affix('checkPosition')

+

Recalculates the state of the affix based on the dimensions, position, and scroll position of the relevant elements. The .affix, .affix-top, and .affix-bottom classes are added to or removed from the affixed content according to the new state. This method needs to be called whenever the dimensions of the affixed content or the target element are changed, to ensure correct positioning of the affixed content.

+ {% highlight js %}$('#myAffix').affix('checkPosition'){% endhighlight %}

Events

Bootstrap's affix plugin exposes a few events for hooking into affix functionality.

diff --git a/docs/_includes/nav/javascript.html b/docs/_includes/nav/javascript.html index eba53771b..de9834248 100644 --- a/docs/_includes/nav/javascript.html +++ b/docs/_includes/nav/javascript.html @@ -117,6 +117,7 @@
  • Examples
  • Usage
  • Options
    • +
  • Methods
  • Events
    • -- cgit v1.2.3 From 75d6c14dc982300728a4c7016a9d7d856869bc3c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 2 May 2015 18:20:59 -0700 Subject: Document that 'manual' is mutually exclusive of other tooltip/popover triggers Closes #16122 [skip sauce] --- docs/_includes/js/popovers.html | 2 +- docs/_includes/js/tooltips.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index a782a1204..9e2532733 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -229,7 +229,7 @@ sagittis lacus vel augue laoreet rutrum faucibus."> trigger string 'click' - How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. + How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. manual cannot be combined with any other trigger. viewport diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 5b399a5f3..991c0c9c9 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -195,7 +195,7 @@ $('#example').tooltip(options) trigger string 'hover focus' - How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. + How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. manual cannot be combined with any other trigger. viewport -- cgit v1.2.3 From 1f5519b981fe4dc9a8d9f423b9b777476afecd45 Mon Sep 17 00:00:00 2001 From: Anthony Barone Date: Sun, 3 May 2015 20:33:38 -0400 Subject: Added #panels-footer to components nav in docs --- docs/_includes/nav/components.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes') diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html index 49c8040c5..639066d65 100644 --- a/docs/_includes/nav/components.html +++ b/docs/_includes/nav/components.html @@ -134,6 +134,7 @@
    • Basic example
    • Panel with heading
      • +
    • Panel with footer
    • Contextual alternatives
    • With tables
    • With list groups -- cgit v1.2.3 From fce30b57e2fbe750cdebf1794d3917f3176d06ce Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 5 May 2015 14:59:32 -0700 Subject: Mark stateful button feature as deprecated Refs https://github.com/twbs/bootstrap/issues/16362#issuecomment-96268469 [skip sauce] --- docs/_includes/js/buttons.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes') diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html index 827906cd8..bd4644b3c 100644 --- a/docs/_includes/js/buttons.html +++ b/docs/_includes/js/buttons.html @@ -10,6 +10,7 @@

      Stateful

      Add data-loading-text="Loading..." to use a loading state on a button.

      +

      This feature is deprecated since v3.3.5 and will be removed in v4.

      Use whichever state you like!

      For the sake of this demonstration, we are using data-loading-text and $().button('loading'), but that's not the only state you can use. See more on this below in the $().button(string) documentation.

      -- cgit v1.2.3 From 89f2c5c5c04022e2e6381d361c66395d99c570d5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 5 May 2015 15:02:07 -0700 Subject: Document that $(...).button('reset') is async. Closes #16362. [skip sauce] --- docs/_includes/js/buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html index bd4644b3c..55009dee2 100644 --- a/docs/_includes/js/buttons.html +++ b/docs/_includes/js/buttons.html @@ -120,7 +120,7 @@

      Toggles push state. Gives the button the appearance that it has been activated.

      $().button('reset')

      -

      Resets button state - swaps text to original text.

      +

      Resets button state - swaps text to original text. This method is asynchronous and returns before the resetting has actually completed.

      $().button(string)

      Swaps text to any data defined text state.

      -- cgit v1.2.3 From a3c480fd9417ac468a7ad96feaa316bc30b276fa Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Wed, 6 May 2015 22:37:56 +0200 Subject: Closes #16249: Doc that nested tabs are not supported --- docs/_includes/js/tabs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/tabs.html b/docs/_includes/js/tabs.html index 3cd5e1b67..c78f9936d 100644 --- a/docs/_includes/js/tabs.html +++ b/docs/_includes/js/tabs.html @@ -2,7 +2,7 @@

      Togglable tabs tab.js

      Example tabs

      -

      Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.

      +

      Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus. Nested tabs are not supported.