Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2 files changed, 6 insertions, 44 deletions

diff --git a/docs/getting-started/support.md b/docs/getting-started/support.md
index 98206d496..989e94442 100644
--- a/docs/getting-started/support.md
+++ b/docs/getting-started/support.md
@@ -162,13 +162,6 @@ 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.
 
-### Safari percent rounding
-
-The rendering engine of versions of Safari prior to v7.1 for OS X and Safari for iOS v8.0 had some trouble with the number of decimal places used in our `.col-*-1` grid classes. So if you had 12 individual grid columns, you'd notice that they came up short compared to other rows of columns. Besides upgrading Safari/iOS, you have some options for workarounds:
-
-- Add `.pull-right` to your last grid column to get the hard-right alignment
-- Tweak your percentages manually to get the perfect rounding for Safari (more difficult than the first option)
-
 ### Modals, navbars, and virtual keyboards
 
 #### Overflow and scrolling
diff --git a/docs/getting-started/third-party-support.md b/docs/getting-started/third-party-support.md
index ea22cf589..604290d02 100644
--- a/docs/getting-started/third-party-support.md
+++ b/docs/getting-started/third-party-support.md
@@ -7,50 +7,19 @@ While we don't officially support any third party plugins or add-ons, we do offe
 
 ### Box-sizing
 
-Some third party software, including Google Maps and Google Custom Search Engine, conflict with Bootstrap due to `* { box-sizing: border-box; }`, a rule which makes it so `padding` does not affect the final computed width of an element. Learn more about [box model and sizing at CSS Tricks](http://css-tricks.com/box-sizing/).
+Some third-party software, including Google Maps and Google Custom Search Engine, conflict with Bootstrap due to `* { box-sizing: border-box; }`, a rule which makes it so `padding` does not affect the final computed width of an element. These widgets expect the box model to be `content-box` instead. Learn more about [box model and sizing at CSS Tricks](http://css-tricks.com/box-sizing/).
 
-Depending on the context, you may override as-needed (Option 1) or reset the box-sizing for entire regions (Option 2).
+You can deal with this conflict by overriding the box model back to `content-box` just for the third-party widget's section of the page:
 
 {% highlight scss %}
-/* Box-sizing resets
+/* Box-sizing reset
  *
- * Reset individual elements or override regions to avoid conflicts due to
- * global box model settings of Bootstrap. Two options, individual overrides and
- * region resets, are available as plain CSS and uncompiled Sass formats.
+ * Override an entire region's box model via CSS
+ * to avoid conflicts due to the global box model settings of Bootstrap.
  */
-
-/* Option 1A: Override a single element's box model via CSS */
-.element {
+.selector-for-some-widget {
   -webkit-box-sizing: content-box;
      -moz-box-sizing: content-box;
           box-sizing: content-box;
 }
-
-/* Option 1B: Override a single element's box model by using a Bootstrap Sass mixin */
-.element {
-  .box-sizing(content-box);
-}
-
-/* Option 2A: Reset an entire region via CSS */
-.reset-box-sizing,
-.reset-box-sizing *,
-.reset-box-sizing *:before,
-.reset-box-sizing *:after {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-}
-
-/* Option 2B: Reset an entire region with a custom Sass mixin */
-.reset-box-sizing {
-  &,
-  *,
-  *:before,
-  *:after {
-    .box-sizing(content-box);
-  }
-}
-.element {
-  .reset-box-sizing();
-}
 {% endhighlight %}