From 6b45c9234a6ae95d92760a369135d5e4e9c063e7 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Sat, 22 Aug 2015 13:52:27 -0400 Subject: Add btn-info to buttons examples Fix #17234 --- docs/components/buttons.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/components') diff --git a/docs/components/buttons.md b/docs/components/buttons.md index 664c8f57b..cb08e40a8 100644 --- a/docs/components/buttons.md +++ b/docs/components/buttons.md @@ -26,6 +26,9 @@ Bootstrap includes six predefined button styles, each serving its own semantic p + + + -- cgit v1.2.3 From 2965adfea0071e05c92ca07450f473ea62714403 Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sat, 22 Aug 2015 21:16:05 +0300 Subject: Remove dropped btn-xs and btn-group-xs from docs --- docs/components/button-group.md | 7 ------- 1 file changed, 7 deletions(-) (limited to 'docs/components') diff --git a/docs/components/button-group.md b/docs/components/button-group.md index 5f7886303..c14d3d63a 100644 --- a/docs/components/button-group.md +++ b/docs/components/button-group.md @@ -68,19 +68,12 @@ Instead of applying button sizing classes to every button in a group, just add ` -
-
- - - -
{% highlight html %}
...
...
...
-
...
{% endhighlight %} ## Nesting -- cgit v1.2.3 From 9c52e03d31be40322f59062551519a7d4e009bef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 18:58:02 -0700 Subject: avoid mentioning css block level in cards docs /cc #17158 #17103 --- docs/components/card.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/card.md b/docs/components/card.md index d6413672d..f7ec63ea8 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -86,7 +86,7 @@ Cards support a wide variety of content, including images, text, list groups, li ## Sizing -Cards are block-level by default, so they'll fill the available horizontal space. Constrain their widths via inline styles, our predefined grid classes, or with custom styles using our grid mixins. +Constrain the width or cards via custom CSS, our predefined grid classes, or with custom styles using our grid mixins. Using the grid: -- cgit v1.2.3 From 44f2e73421bbc56db1a241272e6e587b82fafa2e Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Sun, 23 Aug 2015 04:56:09 +0200 Subject: Docs: fix typo from 9c52e03 --- docs/components/card.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/card.md b/docs/components/card.md index f7ec63ea8..966105e40 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -86,7 +86,7 @@ Cards support a wide variety of content, including images, text, list groups, li ## Sizing -Constrain the width or cards via custom CSS, our predefined grid classes, or with custom styles using our grid mixins. +Constrain the width of cards via custom CSS, our predefined grid classes, or with custom styles using our grid mixins. Using the grid: -- cgit v1.2.3 From cf7819d8d554ed0fe09f78b35bdc6927787c35f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 23:17:46 -0700 Subject: mention the IE compatability for hidden attr per #17169 --- docs/components/utilities.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/utilities.md b/docs/components/utilities.md index 1905efefe..fb93fca9d 100644 --- a/docs/components/utilities.md +++ b/docs/components/utilities.md @@ -233,7 +233,7 @@ Easily clear `float`s by adding `.clearfix` **to the parent element**. Utilizes ## Hidden content -Hide any HTML element with the `[hidden]` attribute. Previously, v3.x included a `.hidden` class that forced toggled content. However, we removed it due to conflicts with jQuery's `hide()` function. It's taken from [PureCSS](http://purecss.io). +Hide any HTML element with the `[hidden]` attribute. Previously, v3.x included a `.hidden` class that forced toggled content. However, we removed it due to conflicts with jQuery's `hide()` function. It's taken from [PureCSS](http://purecss.io). While `[hidden]` technically isn't support in IE9-10, declaring it `display: none` in our CSS gets around. Furthermore, `.invisible` can be used to toggle the visibility of an element, meaning its `display` is not modified and the element can still affect the flow of the document. -- cgit v1.2.3 From fd72dfe6cf9d25630bda74d2db922b7d74ae07d1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 23 Aug 2015 00:44:54 -0700 Subject: Rephrase/copyedit IE [hidden] compatibility docs Fixes grammatical erratum from cf7819d8d554ed0fe09f78b35bdc6927787c35f7 --- docs/components/utilities.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/utilities.md b/docs/components/utilities.md index fb93fca9d..d869a36d1 100644 --- a/docs/components/utilities.md +++ b/docs/components/utilities.md @@ -233,7 +233,7 @@ Easily clear `float`s by adding `.clearfix` **to the parent element**. Utilizes ## Hidden content -Hide any HTML element with the `[hidden]` attribute. Previously, v3.x included a `.hidden` class that forced toggled content. However, we removed it due to conflicts with jQuery's `hide()` function. It's taken from [PureCSS](http://purecss.io). While `[hidden]` technically isn't support in IE9-10, declaring it `display: none` in our CSS gets around. +Hide any HTML element with the `[hidden]` attribute. Previously, v3.x included a `.hidden` class that forced toggled content. However, we removed it due to conflicts with jQuery's `hide()` function. It's taken from [PureCSS](http://purecss.io). While `[hidden]` isn't natively supported by IE9-10, declaring it `display: none` in our CSS gets around that problem. Furthermore, `.invisible` can be used to toggle the visibility of an element, meaning its `display` is not modified and the element can still affect the flow of the document. -- cgit v1.2.3 From 275989e64f6b69d246fa69148f81943336d7bbdf Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 24 Aug 2015 16:32:32 -0700 Subject: Document that dropdowns are intentionally click-based rather than hover-based And link to a relevant blog post w/ more info. Refs #16966 [skip sauce] --- docs/components/dropdowns.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/dropdowns.md b/docs/components/dropdowns.md index 037e0d1cf..785913dc4 100644 --- a/docs/components/dropdowns.md +++ b/docs/components/dropdowns.md @@ -4,7 +4,7 @@ title: Dropdowns group: components --- -Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. +Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision.](http://markdotto.com/2012/02/27/bootstrap-explained-dropdowns/) ## Contents -- cgit v1.2.3 From 0873e9afa852ff723b6b163a7d8aa32aac85c19f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 15:37:08 +0300 Subject: Fix validation errors. --- docs/components/dropdowns.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components') diff --git a/docs/components/dropdowns.md b/docs/components/dropdowns.md index 785913dc4..5e153d596 100644 --- a/docs/components/dropdowns.md +++ b/docs/components/dropdowns.md @@ -34,10 +34,10 @@ You can optionally use ` -
+
-- cgit v1.2.3 From 6aebac8e387941ba736c7098aedf5b1f6db58f18 Mon Sep 17 00:00:00 2001 From: petetnt Date: Wed, 26 Aug 2015 16:01:34 +0300 Subject: Document .bg-inverse --- docs/components/utilities.md | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/components') diff --git a/docs/components/utilities.md b/docs/components/utilities.md index d869a36d1..35d7febe0 100644 --- a/docs/components/utilities.md +++ b/docs/components/utilities.md @@ -132,6 +132,7 @@ Similar to the contextual text color classes, easily set the background of an el
Maecenas sed diam eget risus varius blandit sit amet non magna.
Etiam porta sem malesuada magna mollis euismod.
Donec ullamcorper nulla non metus auctor fringilla.
+
Cras mattis consectetur purus sit amet fermentum.
{% endexample %} {% callout info %} -- cgit v1.2.3 From ec83b06d55e6685e70426758ea3f048c91199352 Mon Sep 17 00:00:00 2001 From: Caleb Land Date: Wed, 26 Aug 2015 23:47:50 -0400 Subject: Update static form control example Use the `row` class on the `form-group`, and change the `control-label` class to `form-control-label` --- docs/components/forms.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/components') diff --git a/docs/components/forms.md b/docs/components/forms.md index f45f207ca..1ebd3ade1 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -397,14 +397,14 @@ When you need to place plain text next to a form label within a form, use the `. {% example html %}
-
- +
+

email@example.com

-
- +
+
-- cgit v1.2.3 From 3e664271279af3b9780e6c7a7b9e607ef491dea1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Aug 2015 22:12:06 +0300 Subject: Less to Sass typos. [ci skip] --- docs/components/collapse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 440d37436..40050c29f 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -96,7 +96,7 @@ The collapse plugin utilizes a few classes to handle the heavy lifting: - `.collapse.in` shows the content - `.collapsing` is added when the transition starts, and removed when it finishes -These classes can be found in `component-animations.less`. +These classes can be found in `_animation.scss`. ### Via data attributes -- cgit v1.2.3 From 81806703e543654532b1f8f8f0eb21d793f9a958 Mon Sep 17 00:00:00 2001 From: Mohamad El-Husseini Date: Fri, 28 Aug 2015 11:35:11 -0300 Subject: removes table-responsive div from components/navs --- docs/components/navs.md | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'docs/components') diff --git a/docs/components/navs.md b/docs/components/navs.md index b27ad3542..e67185189 100644 --- a/docs/components/navs.md +++ b/docs/components/navs.md @@ -316,34 +316,32 @@ When showing a new tab, the events fire in the following order: If no tab was already active, then the `hide.bs.tab` and `hidden.bs.tab` events will not be fired. -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Event TypeDescription
show.bs.tabThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
shown.bs.tabThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
hide.bs.tabThis event fires when a new tab is to be shown (and thus the previous active tab is to be hidden). Use event.target and event.relatedTarget to target the current active tab and the new soon-to-be-active tab, respectively.
hidden.bs.tabThis event fires after a new tab is shown (and thus the previous active tab is hidden). Use event.target and event.relatedTarget to target the previous active tab and the new active tab, respectively.
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Event TypeDescription
show.bs.tabThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
shown.bs.tabThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
hide.bs.tabThis event fires when a new tab is to be shown (and thus the previous active tab is to be hidden). Use event.target and event.relatedTarget to target the current active tab and the new soon-to-be-active tab, respectively.
hidden.bs.tabThis event fires after a new tab is shown (and thus the previous active tab is hidden). Use event.target and event.relatedTarget to target the previous active tab and the new active tab, respectively.
{% highlight js %} $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { -- cgit v1.2.3 From 83283442125170dd55a875254245bd63255844b9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Aug 2015 22:11:44 +0300 Subject: Use `https` when possible. [ci skip] --- docs/components/forms.md | 2 +- docs/components/modal.md | 4 ++-- docs/components/scrollspy.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/components') diff --git a/docs/components/forms.md b/docs/components/forms.md index f45f207ca..2bf223b4d 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -603,7 +603,7 @@ We hide the default `` with `opacity` and use the `.c-indicator` to build With the sibling selector (`~`), we use the `:checked` state to trigger a makeshift checked state on the custom control. -In the checked states, we use **base64 embedded SVG icons** from [Open Iconic](http://useiconic.com/open). This provides us the best control for styling and positioning across browsers and devices. +In the checked states, we use **base64 embedded SVG icons** from [Open Iconic](https://useiconic.com/open). This provides us the best control for styling and positioning across browsers and devices. #### Checkboxes diff --git a/docs/components/modal.md b/docs/components/modal.md index 2b28c1998..c4869255b 100644 --- a/docs/components/modal.md +++ b/docs/components/modal.md @@ -180,7 +180,7 @@ Additionally, you may give a description of your modal dialog with `aria-describ {% callout info %} #### Embedding YouTube videos -Embedding YouTube videos in modals requires additional JavaScript not in Bootstrap to automatically stop playback and more. [See this helpful Stack Overflow post](http://stackoverflow.com/questions/18622508/bootstrap-3-and-youtube-in-modal) for more information. +Embedding YouTube videos in modals requires additional JavaScript not in Bootstrap to automatically stop playback and more. [See this helpful Stack Overflow post](https://stackoverflow.com/questions/18622508/bootstrap-3-and-youtube-in-modal) for more information. {% endcallout %} ## Optional sizes @@ -316,7 +316,7 @@ To take advantage of the Bootstrap grid system within a modal, just nest `.conta ## Varying modal content based on trigger button -Have a bunch of buttons that all trigger the same modal, just with slightly different contents? Use `event.relatedTarget` and [HTML `data-*` attributes](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes) (possibly [via jQuery](http://api.jquery.com/data/)) to vary the contents of the modal depending on which button was clicked. See the Modal Events docs for details on `relatedTarget`. +Have a bunch of buttons that all trigger the same modal, just with slightly different contents? Use `event.relatedTarget` and [HTML `data-*` attributes](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes) (possibly [via jQuery](https://api.jquery.com/data/)) to vary the contents of the modal depending on which button was clicked. See the Modal Events docs for details on `relatedTarget`. {% example html %}
diff --git a/docs/components/scrollspy.md b/docs/components/scrollspy.md index c2625a04b..9d78e6a72 100644 --- a/docs/components/scrollspy.md +++ b/docs/components/scrollspy.md @@ -96,7 +96,7 @@ Navbar links must have resolvable id targets. For example, a `ho {% callout info %} #### Non-`:visible` target elements ignored -Target elements that are not [`:visible` according to jQuery](http://api.jquery.com/visible-selector/) will be ignored and their corresponding nav items will never be highlighted. +Target elements that are not [`:visible` according to jQuery](https://api.jquery.com/visible-selector/) will be ignored and their corresponding nav items will never be highlighted. {% endcallout %} ### Methods -- cgit v1.2.3 From 34932d71b49f91b07c83b4fd41d890db648132f2 Mon Sep 17 00:00:00 2001 From: Gupocca Date: Fri, 28 Aug 2015 23:04:09 -0700 Subject: Fix several erroneous links in docs. Related to #17314. --- docs/components/navbar.md | 1 - docs/components/scrollspy.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/components') diff --git a/docs/components/navbar.md b/docs/components/navbar.md index 2c98c812a..0c8be6fff 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -16,7 +16,6 @@ The navbar is a simple wrapper for positioning branding, navigation, and other e Here's what you need to know before getting started with the navbar: - Navbars require a wrapping `.navbar` and a color scheme class (either `.navbar-default` or `.navbar-inverse`). -- When using multiple components in a navbar, some [alignment classes](#alignment) are required. - Navbars and their contents are fluid by default. Use [optional containers](#containers) to limit their horizontal width. - Use `.pull-left` and `.pull-right` to quickly align sub-components. - Ensure accessibility by using a `