aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-08-01 20:23:39 -0700
committerGitHub <[email protected]>2016-08-01 20:23:39 -0700
commitf41c4f6ef1da3d46ef26ffca986b4b662199c349 (patch)
treec21c21faf47b971e36c8b9748b05da9ca269eb32
parentafe09cdffd1ce23e093454ae388ee93bacf91f0d (diff)
parent7efdd7720aa87e2efbaea6732b341b37183f3a17 (diff)
downloadbootstrap-f41c4f6ef1da3d46ef26ffca986b4b662199c349.tar.xz
bootstrap-f41c4f6ef1da3d46ef26ffca986b4b662199c349.zip
Merge pull request #20417 from twbs/v4-flex-utils-docs
Import the flexbox utilities into the docs flex stylesheet
-rw-r--r--docs/assets/scss/flex-grid.scss11
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/assets/scss/flex-grid.scss b/docs/assets/scss/flex-grid.scss
index 7d0d9f4b8..725a4aa68 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";