From: Mark Otto <markdotto@gmail.com>
Date: Sat, 30 Jul 2016 17:36:14 +0000 (-0700)
Subject: Fixes #20382: Import the flexbox utilities into the docs flex stylesheet
X-Git-Tag: v4.0.0-alpha.4~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F20417%2Fhead;p=thirdparty%2Fbootstrap.git

Fixes #20382: Import the flexbox utilities into the docs flex stylesheet
---

diff --git a/docs/assets/scss/flex-grid.scss b/docs/assets/scss/flex-grid.scss
index 7d0d9f4b85..725a4aa682 100644
--- a/docs/assets/scss/flex-grid.scss
+++ b/docs/assets/scss/flex-grid.scss
@@ -11,7 +11,6 @@
 // Override for flexbox mode
 $enable-flex: true;
 
-
 //
 // Grid mixins
 //
@@ -21,4 +20,14 @@ $enable-flex: true;
 @import "mixins/grid-framework";
 @import "mixins/grid";
 
+//
+// Utilities for flex alignment
+//
+
+@import "utilities/flex";
+
+//
+// Generate the grid class
+//
+
 @import "grid";