From 3481eb28a8f0c695093219f783104c588ccce833 Mon Sep 17 00:00:00 2001 From: Geoff Kimball Date: Wed, 13 Jan 2016 12:51:56 -0800 Subject: [PATCH] Update foundation-everything() to work with flexbox mode and update flex grid docs to reference base flexbox docs --- docs/pages/flex-grid.md | 5 +++-- docs/pages/flexbox.md | 2 +- scss/foundation.scss | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/pages/flex-grid.md b/docs/pages/flex-grid.md index 16ebdc4cf..6bece974b 100644 --- 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 custom download of Foundation 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 6fcede605..b00953b57 100644 --- 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 8124f6e6a..c8d8227b8 100644 --- 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; -- 2.47.2