From 6ed44eded5901d81491d7ef65af7717eef9d3aaf Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 00:20:28 -0400 Subject: [PATCH 1/7] Getting started docs - Migrating section: refactor some of the text for clarity and easy reading.Also removed some rogue tab characters in the source that I introduced in prior commits. --- getting-started.html | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/getting-started.html b/getting-started.html index a4b9eff369..aad498fdab 100644 --- a/getting-started.html +++ b/getting-started.html @@ -270,7 +270,7 @@ bootstrap/

Disabling responsiveness

Bootstrap automatically adapts your pages for various screen sizes. - Here's how to disable this feature so your page works like in this non-responsive example.

+ Here's how to disable this feature so your page works like in this non-responsive example.

Steps to disable page responsiveness

    @@ -280,7 +280,7 @@ bootstrap/
  1. For grid layouts, use .col-xs-* classes in addition to, or in place of, the medium/large ones. Don't worry, the extra-small device grid scales to all resolutions.

You'll still need Respond.js for IE8 (since our media queries are still there and need to be processed). - This disables the "mobile site" aspects of Bootstrap.

+ This disables the "mobile site" aspects of Bootstrap.

Bootstrap template with responsiveness disabled

We've applied these steps to an example. Read its source code to see the specific changes implemented.

@@ -297,11 +297,12 @@ bootstrap/

Migrating from 2.x to 3.0

-

Bootstrap 3 is not backwards compatible with v2.x. Folks looking to upgrade to v3 should use this section as a general upgrade guide. We've outlined some of the major changes and provided tables that highlight key changes. For an overview, read the announcement blog post.

- +

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

-

Reference table for classes that have changed between v2.x and v3.0.

+

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

@@ -453,7 +454,7 @@ bootstrap/

What's new

-

We've added a few new elements and changed some existing ones. Here's their new or updated classes.

+

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

@@ -569,7 +570,7 @@ bootstrap/

What's removed

-

The following elements have been dropped or changed in v3.

+

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

@@ -631,19 +632,23 @@ bootstrap/

Additional notes

-

We've made many underlying changes in v3 that are not immediately apparent. Base classes, key styles, and behaviors have been adjusted for flexibility and our mobile first approach.

+

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 upgrades and code snippets from the community check out Bootply.

+

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

From a82d038f5244c36fed65e7339e3082c4bfc7bf18 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 09:03:03 -0400 Subject: [PATCH 2/7] For consistency with the rest of the docs, removed manually line-wrapped HTML text. --- getting-started.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/getting-started.html b/getting-started.html index aad498fdab..25a76e5b75 100644 --- a/getting-started.html +++ b/getting-started.html @@ -297,9 +297,7 @@ bootstrap/

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.

+

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.

From ea734863c34cebcbd116706b25b4e5a0b2f24df3 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 11:29:51 -0400 Subject: [PATCH 3/7] No manual line breaks in HTML text as per custom. --- getting-started.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/getting-started.html b/getting-started.html index 25a76e5b75..d0909b61ac 100644 --- a/getting-started.html +++ b/getting-started.html @@ -96,8 +96,7 @@ bootstrap/

Basic template

-

Start with this basic HTML template, or modify these examples. - We hope you'll customize our templates and examples, adapting them to suit your needs.

+

Start with this basic HTML template, or modify these examples. We hope you'll customize our templates and examples, adapting them to suit your needs.

Copy the HTML below to begin working with a minimal Bootstrap document.

{% highlight html %} @@ -630,9 +629,7 @@ bootstrap/

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: +

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:

  • Text-based form controls are now 100% wide. Wrap inputs inside <div class="col-*"></div> to control input widths.
    • From 43efd4371715600634da3735b495bf95fb04e041 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 12:17:39 -0400 Subject: [PATCH 4/7] Fixed to lowercase 'v' in 'v3.0' --- getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started.html b/getting-started.html index d0909b61ac..c5b3cc61c9 100644 --- a/getting-started.html +++ b/getting-started.html @@ -643,7 +643,7 @@ bootstrap/ The .modal-header, .modal-body, and .modal-footer sections are now wrapped in .modal-content and .modal-dialog for better mobile styling and behavior.
  • 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.

+

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

From a37b37169f6d1213ababcc35a0dcf13bba00f24f Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 12:18:58 -0400 Subject: [PATCH 5/7] Removed a trailing space at end of line. --- getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started.html b/getting-started.html index c5b3cc61c9..bd8e514a29 100644 --- a/getting-started.html +++ b/getting-started.html @@ -639,7 +639,7 @@ bootstrap/
  • 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. +
  • 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.
  • JavaScript events are namespaced. For example, to handle the modal "show" event, use 'show.bs.modal'. For tabs "shown" use 'shown.bs.tab', etc..
    • From 11c3ffe4fc149b986e5a8be6beb3c3d4f6b3219e Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 12:22:51 -0400 Subject: [PATCH 6/7] Yet another manually wrapped text line consolidated --- getting-started.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/getting-started.html b/getting-started.html index bd8e514a29..7705e85d85 100644 --- a/getting-started.html +++ b/getting-started.html @@ -639,8 +639,7 @@ bootstrap/
  • 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.
  • 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.

    From e3647c1320bd6d7fe070c33686cdc1eb0f879cf7 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Wed, 4 Sep 2013 14:40:32 -0400 Subject: [PATCH 7/7] fixed a

    tag that was on its own line. --- getting-started.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/getting-started.html b/getting-started.html index 7705e85d85..91648b5037 100644 --- a/getting-started.html +++ b/getting-started.html @@ -629,8 +629,7 @@ bootstrap/

    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: -

    +

    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:

    • Text-based form controls are now 100% wide. Wrap inputs inside <div class="col-*"></div> to control input widths.
    • .badge no longer has contextual (-success,-primary,etc..) classes.