diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 31ba46403f..37ea1119c5 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -46,6 +46,7 @@
See how aspects of the Bootstrap grid system work across multiple devices with a handy table.
-@@ -1217,11 +1217,10 @@ For example, |
---|
# | +Table heading | +Table heading | +Table heading | +Table heading | +Table heading | +Table heading | +
---|---|---|---|---|---|---|
1 | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +
2 | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +
3 | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +
# | +Table heading | +Table heading | +Table heading | +Table heading | +Table heading | +Table heading | +
---|---|---|---|---|---|---|
1 | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +
2 | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +
3 | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +Table cell | +
<section>
should be wrapped as inline.
For faster mobile-friendly development, use these utility classes for showing and hiding content by device via media query. Also included are utility classes for toggling content when printed.
Bootstrap 2.x | -Bootstrap 3.0 | -
---|---|
.container-fluid |
- .container |
-
.row-fluid |
- .row |
-
.span* |
- .col-md-* |
-
.offset* |
- .col-md-offset-* |
-
.brand |
- .navbar-brand |
-
.hero-unit |
- .jumbotron |
-
.icon-* |
- .glyphicon .glyphicon-* |
-
.btn |
- .btn .btn-default |
-
.btn-mini |
- .btn-xs |
-
.btn-small |
- .btn-sm |
-
.btn-large |
- .btn-lg |
-
.visible-phone |
- .visible-sm |
-
.visible-tablet |
- .visible-md |
-
.visible-desktop |
- .visible-lg |
-
.hidden-phone |
- .hidden-sm |
-
.hidden-tablet |
- .hidden-md |
-
.hidden-desktop |
- .hidden-lg |
-
.input-small |
- .input-sm |
-
.input-large |
- .input-lg |
-
.input-prepend |
- .input-group |
-
.input-append |
- .input-group |
-
.add-on |
- .input-group-addon |
-
.btn-navbar |
- .navbar-btn |
-
.thumbnail |
- .img-thumbnail |
-
ul.inline |
- .list-inline |
-
Bootstrap 2.x | +Bootstrap 3.0 | +
---|---|
.container-fluid |
+ .container |
+
.row-fluid |
+ .row |
+
.span* |
+ .col-md-* |
+
.offset* |
+ .col-md-offset-* |
+
.brand |
+ .navbar-brand |
+
.hero-unit |
+ .jumbotron |
+
.icon-* |
+ .glyphicon .glyphicon-* |
+
.btn |
+ .btn .btn-default |
+
.btn-mini |
+ .btn-xs |
+
.btn-small |
+ .btn-sm |
+
.btn-large |
+ .btn-lg |
+
.visible-phone |
+ .visible-sm |
+
.visible-tablet |
+ .visible-md |
+
.visible-desktop |
+ .visible-lg |
+
.hidden-phone |
+ .hidden-sm |
+
.hidden-tablet |
+ .hidden-md |
+
.hidden-desktop |
+ .hidden-lg |
+
.input-small |
+ .input-sm |
+
.input-large |
+ .input-lg |
+
.input-prepend |
+ .input-group |
+
.input-append |
+ .input-group |
+
.add-on |
+ .input-group-addon |
+
.btn-navbar |
+ .navbar-btn |
+
.thumbnail |
+ .img-thumbnail |
+
ul.inline |
+ .list-inline |
+
We've added a few new elements and changed some existing ones. Here's their new or updated classes.
-Element | -Description | -
---|---|
Panels | -.panel .panel-body .panel-title .panel-heading .panel-footer .panel-collapse |
-
List groups | -.list-group .list-group-item .list-group-item-text .list-group-item-heading |
-
Glyphicons | -.glyphicon |
-
Jumbotron | -.jumbotron |
-
Tiny grid (<768 px) | -.col-xs-* |
-
Small grid (>768 px) | -.col-sm-* |
-
Medium grid (>992 px) | -.col-md-* |
-
Large grid (>1200 px) | -.col-lg-* |
-
Offsets | -.col-sm-offset-* .col-md-offset-* .col-lg-offset-* |
-
Push | -.col-sm-push-* .col-md-push-* .col-lg-push-* |
-
Pull | -.col-sm-pull-* .col-md-pull-* .col-lg-pull-* |
-
Input groups | -.input-group .input-group-addon .input-group-btn |
-
Form controls | -.form-control .form-group |
-
Inline controls | -.checkbox-inline .radio-inline |
-
Button group sizes | -.btn-group-xs .btn-group-sm .btn-group-lg |
-
Navbar text | -.navbar-text |
-
Navbar header | -.navbar-header |
-
Justified tabs / pills | -.nav-justified |
-
Responsive images | -.img-responsive |
-
Contextual table rows | -.success .danger .warning .active |
-
Contextual panels | -.panel-success .panel-danger .panel-warning .panel-info |
-
Modal | -.modal-dialog .modal-content |
-
Thumbnail image | -.img-thumbnail |
-
Well sizes | -.well-sm .well-lg |
-
Alert links | -.alert-link |
-
Element | +Description | +
---|---|
Panels | +.panel .panel-body .panel-title .panel-heading .panel-footer .panel-collapse |
+
List groups | +.list-group .list-group-item .list-group-item-text .list-group-item-heading |
+
Glyphicons | +.glyphicon |
+
Jumbotron | +.jumbotron |
+
Tiny grid (<768 px) | +.col-xs-* |
+
Small grid (>768 px) | +.col-sm-* |
+
Medium grid (>992 px) | +.col-md-* |
+
Large grid (>1200 px) | +.col-lg-* |
+
Offsets | +.col-sm-offset-* .col-md-offset-* .col-lg-offset-* |
+
Push | +.col-sm-push-* .col-md-push-* .col-lg-push-* |
+
Pull | +.col-sm-pull-* .col-md-pull-* .col-lg-pull-* |
+
Input groups | +.input-group .input-group-addon .input-group-btn |
+
Form controls | +.form-control .form-group |
+
Inline controls | +.checkbox-inline .radio-inline |
+
Button group sizes | +.btn-group-xs .btn-group-sm .btn-group-lg |
+
Navbar text | +.navbar-text |
+
Navbar header | +.navbar-header |
+
Justified tabs / pills | +.nav-justified |
+
Responsive images | +.img-responsive |
+
Contextual table rows | +.success .danger .warning .active |
+
Contextual panels | +.panel-success .panel-danger .panel-warning .panel-info |
+
Modal | +.modal-dialog .modal-content |
+
Thumbnail image | +.img-thumbnail |
+
Well sizes | +.well-sm .well-lg |
+
Alert links | +.alert-link |
+
The following elements have been dropped or changed in v3.
-Element | -Removed from 2.x | -3.0 Equivalent | -
---|---|---|
Hero Unit | -.hero-unit |
- .jumbotron |
-
Form actions | -.form-actions |
- - | -
Grid | -.span* |
- .col-md-* |
-
Fluid container | -.container-fluid |
- .container (no more fixed grid) |
-
Fluid row | -.row-fluid |
- .row (no more fixed grid) |
-
Icons | -.icon-* |
- .glyphicon-* |
-
Navbar button | -.btn-navbar |
- .navbar-btn |
-
Navbar inner | -.navbar-inner |
- - | -
Thumbnails | -.thumbnails |
- .col-* and .thumbnail |
-
Input append / prepend | -.input-append .input-prepend .add-on |
- .input-group |
-
Dropdown submenu | -.dropdown-submenu |
- - | -
Tab alignments | -.tabs-left .tabs-right .tabs-below |
- - | -
Element | +Removed from 2.x | +3.0 Equivalent | +
---|---|---|
Hero Unit | +.hero-unit |
+ .jumbotron |
+
Form actions | +.form-actions |
+ - | +
Grid | +.span* |
+ .col-md-* |
+
Fluid container | +.container-fluid |
+ .container (no more fixed grid) |
+
Fluid row | +.row-fluid |
+ .row (no more fixed grid) |
+
Icons | +.icon-* |
+ .glyphicon-* |
+
Navbar button | +.btn-navbar |
+ .navbar-btn |
+
Navbar inner | +.navbar-inner |
+ - | +
Thumbnails | +.thumbnails |
+ .col-* and .thumbnail |
+
Input append / prepend | +.input-append .input-prepend .add-on |
+ .input-group |
+
Dropdown submenu | +.dropdown-submenu |
+ - | +
Tab alignments | +.tabs-left .tabs-right .tabs-below |
+ - | +
We've made many underlying changes in v3 that are not immediately apparent without closer inspection. Base classes, key styles, and behaviors have been adjusted for flexibility and our mobile first approach.
diff --git a/javascript.html b/javascript.html index 40c04f58bb..e79a02c747 100644 --- a/javascript.html +++ b/javascript.html @@ -240,7 +240,7 @@ $('#myModal').on('show.bs.modal', function (e) {Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-backdrop=""
.
Bootstrap's modal class exposes a few events for hooking into modal functionality.
-Toggles the dropdown menu of a given navbar or tabbed navigation.
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-offset=""
.
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-animation=""
.
Options for individual tooltips can alternatively be specified through the use of data attributes, as explained above.
@@ -914,7 +914,7 @@ $('#example').tooltip(options) {% highlight js %}$('#element').tooltip('destroy'){% endhighlight %}Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-animation=""
.
Options for individual popovers can alternatively be specified through the use of data attributes, as explained above.
@@ -1138,7 +1138,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {Hides and destroys an element's popover.
{% highlight js %}$('#element').popover('destroy'){% endhighlight %}Bootstrap's alert class exposes a few events for hooking into alert functionality.
-Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-parent=""
.
Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
-Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-interval=""
.
Bootstrap's carousel class exposes two events for hooking into carousel functionality.
-Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-
, as in data-offset-top="200"
.