Update foundation-everything() to work with flexbox mode and update flex grid docs...

diff --git a/docs/pages/flex-grid.md b/docs/pages/flex-grid.md
index 16ebdc4cf0df143dca97994a11732c944583c704..6bece974b65b15ec54915c5a061156aff646ce19 100644 (file)
--- a/docs/pages/flex-grid.md
+++ b/docs/pages/flex-grid.md
@@ -16,14 +16,15 @@ The flex grid is only supported in Chrome, Firefox, Safari 6+, IE10+, iOS 7+, an
 
 ## Importing
 
-If you're using the CSS version of Foundation, you'll need to generate a [custom download](http://foundation.zurb.com/sites/download/#customizeFoundation) that replaces the float grid with the flex grid.
+If you're using the CSS version of Foundation, you can generate a <a href="https://foundation.zurb.com/sites/download">custom download of Foundation</a> with flexbox mode enabled.
 
-If you're using the Sass version of Foundation, remove the CSS export for the float grid, and replace it with the CSS export for the flex grid.
+If you're using the Sass version of Foundation, you can enable a framework-wide flexbox mode, and add exports for the flex grid and flexbox helper classes. [Learn more about enabling flexbox mode.](flexbox.html#enabling-flexbox-mode)
 
 ```scss
 @import 'foundation';
 
 // @include foundation-grid;
+@include foundation-flex-classes;
 @include foundation-flex-grid;
 ```
 

diff --git a/docs/pages/flexbox.md b/docs/pages/flexbox.md
index 6fcede605da98333be4cbd48984ceefb2ee4eb21..b00953b57fd73fa0fa2d77b5491919e0811ebed7 100644 (file)
--- a/docs/pages/flexbox.md
+++ b/docs/pages/flexbox.md
@@ -33,7 +33,7 @@ You'll also need to replace the default float grid with the flex grid, which is
 @include foundation-flex-grid;
 ```
 
-Lastly, you'll also may want to add the include for the flexbox helper classes.
+Lastly, you'll also want to add the include for the flexbox helper classes.
 
 ```scss
 @include foundation-flex-classes;

diff --git a/scss/foundation.scss b/scss/foundation.scss
index 8124f6e6a7f40f2b676ef57bf4b6f38b3af3f28b..c8d8227b8b5b07150051d305029cabd89534288d 100644 (file)
--- a/scss/foundation.scss
+++ b/scss/foundation.scss
@@ -50,6 +50,8 @@
 @import 'components/tooltip';
 
 @mixin foundation-everything($flex: false) {
+  $global-flexbox: $flex !global;
+
   @include foundation-global-styles;
   @if not $flex {
     @include foundation-grid;