Merge branch 'v4-dev' into v4-forms-cleanup

author: Mark Otto <[email protected]> 2016-04-08 20:55:19 -0500
committer: Mark Otto <[email protected]> 2016-04-08 20:55:19 -0500
commit: 80144d74d7435746f786e8eceae3a4adc07f93ac (patch)
tree: a6f1c8654961d2bd9c3ea2fa8639942826b9e489 /docs/getting-started
parent: 325c1d4c3cde965229c6f512739946f8076fc225 (diff)
parent: 2cc75671e143587ace7efaf79c5b3350a711d57d (diff)
download: bootstrap-80144d74d7435746f786e8eceae3a4adc07f93ac.tar.xz
bootstrap-80144d74d7435746f786e8eceae3a4adc07f93ac.zip
3 files changed, 17 insertions, 16 deletions
diff --git a/docs/getting-started/browsers-devices.md b/docs/getting-started/browsers-devices.md
index d06845e90..497553610 100644
--- a/docs/getting-started/browsers-devices.md
+++ b/docs/getting-started/browsers-devices.md
@@ -191,15 +191,15 @@ For more information and usage guidelines, read [Windows Phone 8 and Device-Widt
 
 As a heads up, we include this in all of Bootstrap's documentation and examples as a demonstration.
 
-## Modals, navbars, and virtual keyboards
+## Modals and dropdowns on mobile
 
 ### Overflow and scrolling
 
-Support for `overflow: hidden;` on the `<body>` element is quite limited in iOS and Android. To that end, when you scroll past the top or bottom of a modal in either of those devices' browsers, the `<body>` content will begin to scroll. See [WebKit bug #153852](https://bugs.webkit.org/show_bug.cgi?id=153852).
+Support for `overflow: hidden;` on the `<body>` element is quite limited in iOS and Android. To that end, when you scroll past the top or bottom of a modal in either of those devices' browsers, the `<body>` content will begin to scroll. See [Chrome bug #175502](https://bugs.chromium.org/p/chromium/issues/detail?id=175502) (fixed in Chrome v40) and [WebKit bug #153852](https://bugs.webkit.org/show_bug.cgi?id=153852).
 
-### Virtual keyboards
+### iOS text fields and scrolling
 
-Also, note that if you're using a fixed navbar or using inputs within a modal, iOS has a rendering bug that doesn't update the position of fixed elements when the virtual keyboard is triggered. A few workarounds for this include transforming your elements to `position: absolute;` or invoking a timer on focus to try to correct the positioning manually. This is not handled by Bootstrap, so it is up to you to decide which solution is best for your application.
+As of iOS 9.2, while a modal is open, if the initial touch of a scroll gesture is within the boundary of a textual `<input>` or a `<textarea>`, the `<body>` content underneath the modal will be scrolled instead of the modal itself. See [WebKit bug #153856](https://bugs.webkit.org/show_bug.cgi?id=153856).
 
 ### Navbar Dropdowns
 
@@ -218,13 +218,13 @@ Bootstrap includes a workaround for this, although it is disabled by default. By
 
 Even in some modern browsers, printing can be quirky.
 
-In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. See [issue #12078](https://github.com/twbs/bootstrap/issues/12078) for some details. Suggested workarounds:
+In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. See [issue #12078](https://github.com/twbs/bootstrap/issues/12078) and [Chrome bug #273306](https://bugs.chromium.org/p/chromium/issues/detail?id=273306) for some details. Suggested workarounds:
 
 * Embrace the extra-small grid and make sure your page looks acceptable under it.
 * Customize the value of the `$grid-breakpoints` Sass variable so that your printer paper is considered larger than extra-small.
 * Add custom media queries to change the grid size breakpoints for print media only.
 
-Also, as of Safari v8.0, use of the fixed-width `.container` class can cause Safari to use an unusually small font size when printing. See [issue #14868](https://github.com/twbs/bootstrap/issues/14868) for more details. One potential workaround is the following CSS:
+Also, as of Safari v8.0, use of the fixed-width `.container` class can cause Safari to use an unusually small font size when printing. See [issue #14868](https://github.com/twbs/bootstrap/issues/14868) and [WebKit bug #138192](https://bugs.webkit.org/show_bug.cgi?id=138192) for more details. One potential workaround is the following CSS:
 
 {% highlight css %}
 @media print {
diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md
index 0dabd30f9..47c25b494 100644
--- a/docs/getting-started/build-tools.md
+++ b/docs/getting-started/build-tools.md
@@ -49,7 +49,7 @@ Bootstrap uses [Autoprefixer][autoprefixer] (included in our Gruntfile and build
 
 ## Local documentation
 
-Running our documentation locally requires the use of Jekyll, a decently flexible static site generator that provides us basic includes, Markdown-based files, templates, and more. Here's how to get it started:
+Running our documentation locally requires the use of Jekyll, a decently flexible static site generator that provides us: basic includes, Markdown-based files, templates, and more. Here's how to get it started:
 
 1. Run through the [tooling setup](#tooling-setup) above to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`.
 2. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line.
diff --git a/docs/getting-started/options.md b/docs/getting-started/options.md
index 0a98c40d3..8ed206888 100644
--- a/docs/getting-started/options.md
+++ b/docs/getting-started/options.md
@@ -28,12 +28,13 @@ Do the same for any variable you need to override, including the global options
 
 You can find and customize these variables for key global options in our `_variables.scss` file.
 
-| Variable                    | Values                             | Description                                                             |
-| --------------------------- | ---------------------------------- | ----------------------------------------------------------------------- |
-| `$spacer`                   | `1rem` (default), or any value > 0 | Specifies the default spacer value for our spacer utilities.            |
-| `$enable-flex`              | `true` or `false` (default)        | Swaps `float` and `display: table` styles for `display: flex`.          |
-| `$enable-rounded`           | `true` (default) or `false`        | Enables predefined `border-radius` styles on various components.        |
-| `$enable-shadows`           | `true` or `false` (default)        | Enables predefined `box-shadow` styles on various components.           |
-| `$enable-gradients`         | `true` or `false` (default)        | Enables predefined gradients via `background-image` styles on various components. |
-| `$enable-transitions`       | `true` (default) or `false`        | Enables predefined `transition`s on various components.                 |
-| `$enable-hover-media-query` | `true` or `false` (default)        | ...                                                                     |
+| Variable                    | Values                             | Description                                                                            |
+| --------------------------- | ---------------------------------- | -------------------------------------------------------------------------------------- |
+| `$spacer`                   | `1rem` (default), or any value > 0 | Specifies the default spacer value for our spacer utilities.                           |
+| `$enable-flex`              | `true` or `false` (default)        | Swaps `float` and `display: table` styles for `display: flex`.                         |
+| `$enable-rounded`           | `true` (default) or `false`        | Enables predefined `border-radius` styles on various components.                       |
+| `$enable-shadows`           | `true` or `false` (default)        | Enables predefined `box-shadow` styles on various components.                          |
+| `$enable-gradients`         | `true` or `false` (default)        | Enables predefined gradients via `background-image` styles on various components.      |
+| `$enable-transitions`       | `true` (default) or `false`        | Enables predefined `transition`s on various components.                                |
+| `$enable-hover-media-query` | `true` or `false` (default)        | ...                                                                                    |
+| `$enable-grid-classes`      | `true` (default) or `false`        | Enables the generation of CSS classes for the grid system (e.g. `.col-md-1` etc.).     |
author	Mark Otto <[email protected]>	2016-04-08 20:55:19 -0500
committer	Mark Otto <[email protected]>	2016-04-08 20:55:19 -0500
commit	80144d74d7435746f786e8eceae3a4adc07f93ac (patch)
tree	a6f1c8654961d2bd9c3ea2fa8639942826b9e489 /docs/getting-started
parent	325c1d4c3cde965229c6f512739946f8076fc225 (diff)
parent	2cc75671e143587ace7efaf79c5b3350a711d57d (diff)
download	bootstrap-80144d74d7435746f786e8eceae3a4adc07f93ac.tar.xz bootstrap-80144d74d7435746f786e8eceae3a4adc07f93ac.zip