From c32261221829f32c4ad808d1ccc1a2090a114bff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Jan 2014 14:09:09 -0800 Subject: move migration docs to new separate page, leave callout on getting started page; fixes #12244 --- docs/migration.html | 423 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 423 insertions(+) create mode 100644 docs/migration.html (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html new file mode 100644 index 000000000..c0f0d9c48 --- /dev/null +++ b/docs/migration.html @@ -0,0 +1,423 @@ +--- +layout: default +title: Migrating to v3.x +slug: migration +lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on major changes, what's new, and what's been removed." +--- + + + + +
+

Migrating from 2.x to 3.0

+ +

Bootstrap 3 is not backwards compatible with v2.x. Use this section as a general guide to upgrading from v2.x to v3.0. For a broader overview, see what's new in the v3.0 release announcement.

+ +

Major class changes

+

This table shows the style changes between v2.x and v3.0.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Bootstrap 2.xBootstrap 3.0
.row-fluid.row
.span*.col-md-*
.offset*.col-md-offset-*
.brand.navbar-brand
.nav-collapse.navbar-collapse
.nav-toggle.navbar-toggle
.btn-navbar.navbar-btn
.hero-unit.jumbotron
.icon-*.glyphicon .glyphicon-*
.btn.btn .btn-default
.btn-mini.btn-xs
.btn-small.btn-sm
.btn-large.btn-lg
.alert-error.alert-danger
.visible-phone.visible-xs
.visible-tablet.visible-sm
.visible-desktopSplit into .visible-md .visible-lg
.hidden-phone.hidden-xs
.hidden-tablet.hidden-sm
.hidden-desktopSplit into .hidden-md .hidden-lg
.input-small.input-sm
.input-large.input-lg
.input-block-level.form-control
.control-group.form-group
.control-group.warning .control-group.error .control-group.success.form-group.has-*
.checkbox.inline .radio.inline.checkbox-inline .radio-inline
.input-prepend .input-append.input-group
.add-on.input-group-addon
.img-polaroid.img-thumbnail
ul.unstyled.list-unstyled
ul.inline.list-inline
.muted.text-muted
.label.label .label-default
.label-important.label-danger
.text-error.text-danger
.table .error.table .danger
.bar.progress-bar
.bar-*.progress-bar-*
.accordion.panel-group
.accordion-group.panel .panel-default
.accordion-heading.panel-heading
.accordion-body.panel-collapse
.accordion-inner.panel-body
+
+ +

What's new

+

We've added new elements and changed some existing ones. Here are the new or updated styles.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ElementDescription
Panels.panel .panel-default .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
Extra small grid (<768px).col-xs-*
Small grid (≥768px).col-sm-*
Medium grid (≥992px).col-md-*
Large grid (≥1200px).col-lg-*
Responsive utility classes (≥1200px).visible-lg .hidden-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
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
+
+ + +

What's removed

+

The following elements have been dropped or changed in v3.0.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ElementRemoved from 2.x3.0 Equivalent
Form actions.form-actionsN/A
Search form.form-searchN/A
Form group with info.control-group.infoN/A
Block level from input.input-block-levelNo direct equivalent, but forms controls are similar.
Fluid row.row-fluid.row (no more fixed grid)
Controls wrapper.controlsN/A
Controls row.controls-row.row or .form-group
Navbar inner.navbar-innerN/A
Navbar vertical dividers.navbar .divider-verticalN/A
Dropdown submenu.dropdown-submenuN/A
Tab alignments.tabs-left .tabs-right .tabs-belowN/A
Pill-based tabbable area.pill-content.tab-content
Pill-based tabbable area pane.pill-pane.tab-pane
Nav lists.nav-list .nav-headerNo direct equivalent, but list groups and .panel-groups are similar.
+
+ + +

Additional notes

+

Other changes in v3.0 are not immediately apparent. Base classes, key styles, and behaviors have been adjusted for flexibility and our mobile first approach. Here's a partial list:

+ +

For more information on upgrading to v3.0, and code snippets from the community, see Bootply.

+
-- cgit v1.2.3 From 9e8afcc6616546d38204d5b8da96ed1126aa0ea8 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 18 Jan 2014 16:08:39 -0800 Subject: Add table's .info variant to migration guide --- docs/migration.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html index c0f0d9c48..ebff44885 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -290,7 +290,7 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m Contextual table rows - .success .danger .warning .active + .success .danger .warning .active .info Contextual panels -- cgit v1.2.3 From a2ff16c3cef2c4c6a04feace15b1541226705a8e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 3 Feb 2014 01:44:50 -0800 Subject: fix #12540 --- docs/migration.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html index ebff44885..69fe8d08c 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -105,14 +105,6 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m .hidden-desktop Split into .hidden-md .hidden-lg - - .input-small - .input-sm - - - .input-large - .input-lg - .input-block-level .form-control @@ -260,6 +252,10 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m Pull .col-sm-pull-* .col-md-pull-* .col-lg-pull-* + + Input height sizes + .input-sm .input-lg + Input groups .input-group .input-group-addon .input-group-btn @@ -345,7 +341,12 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m N/A - Block level from input + Fixed-width input sizes + .input-mini .input-small .input-medium .input-large .input-xlarge .input-xxlarge + Use .form-control and the grid system instead. + + + Block level form input .input-block-level No direct equivalent, but forms controls are similar. -- cgit v1.2.3 From 69af98e6bb74b0bbc3b3964340f5952d83ae5130 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 3 Feb 2014 01:57:45 -0800 Subject: add .btn-inverse removal to migration guide; fixes #12538 --- docs/migration.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html index 69fe8d08c..685d11a41 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -350,6 +350,11 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m .input-block-level No direct equivalent, but forms controls are similar. + + Inverse buttons + .btn-inverse + N/A + Fluid row .row-fluid -- cgit v1.2.3 From d5558621b22ef10abb43646b59c9823cad852e68 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 3 Feb 2014 02:04:17 -0800 Subject: add removal of .help-inline to the migration guide; fixes #12539 --- docs/migration.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html index 69fe8d08c..4c6fa70a1 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -400,6 +400,11 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m .nav-list .nav-header No direct equivalent, but list groups and .panel-groups are similar. + + Inline help for form controls + .help-inline + No exact equivalent, but .help-block is similar. + -- cgit v1.2.3 From e958008048dbd359cec0cc16f23d69881107203b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 3 Feb 2014 02:11:25 -0800 Subject: fix #12541 --- docs/migration.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html index c2654e6f1..ddbd99362 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -426,7 +426,7 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m
  • Images are no longer responsive by default. Use .img-responsive for fluid <img> size.
  • The icons, now .glyphicon, are now font based. Icons also require a base and icon class (e.g. .glyphicon .glyphicon-asterisk).
  • Typeahead has been dropped, in favor of using Twitter Typeahead.
    • -
  • Modal markup has changed significantly. The .modal-header, .modal-body, and .modal-footer sections are now wrapped in .modal-content and .modal-dialog for better mobile styling and behavior.
    • +
  • Modal markup has changed significantly. The .modal-header, .modal-body, and .modal-footer sections are now wrapped in .modal-content and .modal-dialog for better mobile styling and behavior. Also, you should no longer apply .hide to .modal in your markup.
  • The HTML loaded by the remote modal option is now injected into the .modal instead of into the .modal-body. This allows you to also easily vary the header and footer of the modal, not just the modal body.
  • JavaScript events are namespaced. For example, to handle the modal "show" event, use 'show.bs.modal'. For tabs "shown" use 'shown.bs.tab', etc.
    • -- cgit v1.2.3 From 819b19e39c3dc12f4201e6c0f27d49e1742dbbba Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 3 Feb 2014 23:05:51 -0800 Subject: fix #12494 in the migration docs --- docs/migration.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/migration.html') diff --git a/docs/migration.html b/docs/migration.html index ddbd99362..d8fe72741 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -427,7 +427,7 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m
  • The icons, now .glyphicon, are now font based. Icons also require a base and icon class (e.g. .glyphicon .glyphicon-asterisk).
  • Typeahead has been dropped, in favor of using Twitter Typeahead.
  • Modal markup has changed significantly. The .modal-header, .modal-body, and .modal-footer sections are now wrapped in .modal-content and .modal-dialog for better mobile styling and behavior. Also, you should no longer apply .hide to .modal in your markup.
    • -
  • The HTML loaded by the remote modal option is now injected into the .modal instead of into the .modal-body. This allows you to also easily vary the header and footer of the modal, not just the modal body.
    • +
  • As of v3.1.0, the HTML loaded by the remote modal option is now injected into the .modal-content (from v3.0.0 to v3.0.3, into the .modal) instead of into the .modal-body. This allows you to also easily vary the header and footer of the modal, not just the modal body.
  • JavaScript events are namespaced. For example, to handle the modal "show" event, use 'show.bs.modal'. For tabs "shown" use 'shown.bs.tab', etc.

    • For more information on upgrading to v3.0, and code snippets from the community, see Bootply.

    -- cgit v1.2.3