Options for individual tooltips can alternatively be specified through the use of data attributes, as explained above.
@@ -850,32 +862,34 @@ $('#example').tooltip(options)
{% highlight js %}$('#element').tooltip('destroy'){% endhighlight %}
{% highlight js %}
$('#myTooltip').on('hidden.bs.tooltip', function () {
// do something…
@@ -970,78 +984,80 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-animation="".
Data attributes for individual popovers
Options for individual popovers can alternatively be specified through the use of data attributes, as explained above.
@@ -1070,32 +1086,34 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
Hides and destroys an element's popover.
{% highlight js %}$('#element').popover('destroy'){% endhighlight %}
Events
-
-
-
- | Event Type |
- Description |
-
-
-
-
- | show |
- This event fires immediately when the show instance method is called. |
-
-
- | shown |
- This event is fired when the popover has been made visible to the user (will wait for CSS transitions to complete). |
-
-
- | hide |
- This event is fired immediately when the hide instance method has been called. |
-
-
- | hidden |
- This event is fired when the popover has finished being hidden from the user (will wait for CSS transitions to complete). |
-
-
-
+
{% highlight js %}
$('#myPopover').on('hidden.bs.popover', function () {
// do something…
@@ -1152,24 +1170,26 @@ $('#myPopover').on('hidden.bs.popover', function () {
Events
Bootstrap's alert class exposes a few events for hooking into alert functionality.
-
-
-
- | Event Type |
- Description |
-
-
-
-
- | close |
- This event fires immediately when the close instance method is called. |
-
-
- | closed |
- This 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…
@@ -1444,31 +1464,32 @@ $(".collapse").collapse()
Options
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-parent="".
-
-
-
- | Name |
- type |
- default |
- description |
-
-
-
-
- | parent |
- selector |
- false |
- If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior) |
-
-
- | toggle |
- boolean |
- true |
- Toggles the collapsible element on invocation |
-
-
-
-
+
Methods
@@ -1491,34 +1512,36 @@ $('#myCollapsible').collapse({
Events
Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
-
-
-
- | Event Type |
- Description |
-
-
-
-
- | show |
- This event fires immediately when the show instance method is called. |
-
-
- | shown |
- This event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete). |
-
-
- | hide |
-
- This event is fired immediately when the hide method has been called.
- |
-
-
- | hidden |
- This event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete). |
-
-
-
+
{% highlight js %}
$('#myCollapsible').on('hidden.bs.collapse', function () {
// do something…
@@ -1661,30 +1684,32 @@ $('.carousel').carousel()
Options
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-interval="".
-
-
-
- | Name |
- type |
- default |
- description |
-
-
-
-
- | interval |
- number |
- 5000 |
- The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle. |
-
-
- | pause |
- string |
- "hover" |
- Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave. |
-
-
-
+
Methods
@@ -1714,24 +1739,26 @@ $('.carousel').carousel({
Events
Bootstrap's carousel class exposes two events for hooking into carousel functionality.
-
-
-
- | Event Type |
- Description |
-
-
-
-
- | slide |
- This event fires immediately when the slide instance method is invoked. |
-
-
- | slid |
- This event is fired when the carousel has completed its slide transition. |
-
-
-
+
{% highlight js %}
$('#myCarousel').on('slide.bs.carousel', function () {
// do something…
@@ -1787,22 +1814,25 @@ $('#myCarousel').on('slide.bs.carousel', function () {
Options
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-offset-top="200".
-
-
-
- | Name |
- type |
- default |
- description |
-
-
-
-
- | offset |
- number | function | object |
- 10 |
- Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and left directions. To provide a unique, bottom and top offset just provide an object offset: { top: 10 } or offset: { top: 10, bottom: 5 }. Use a function when you need to dynamically calculate an offset. |
-
-
-
+
+
diff --git a/less/navs.less b/less/navs.less
index 7d64ef13a8..00b753771a 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -132,9 +132,7 @@
border-radius: 5px;
}
+ li {
- > a {
- margin-left: 2px;
- }
+ margin-left: 2px;
}
// Active state
@@ -167,12 +165,11 @@
// -------------------------
.nav-justified {
- display: table;
width: 100%;
> li {
float: none;
display: table-cell;
- width: auto;
+ width: 1%;
> a {
text-align: center;
}
diff --git a/less/type.less b/less/type.less
index 5c5dc5cc6c..0acb7f35d4 100644
--- a/less/type.less
+++ b/less/type.less
@@ -11,9 +11,13 @@ p {
}
.lead {
margin-bottom: @line-height-computed;
- font-size: (@font-size-base * 1.5);
+ font-size: (@font-size-base * 1.15);
font-weight: 200;
line-height: 1.4;
+
+ @media (min-width: 768px) {
+ font-size: (@font-size-base * 1.5);
+ }
}