From 8fae85e9e60232a6dad2c1b65cfeb6b9b495dfc8 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sat, 15 Mar 2014 21:35:13 -0500 Subject: [PATCH] fix(grid): Correct responsive grid breaks for col-XX, closes #803 --- scss/_mixins.scss | 6 ++++-- test/html/grid.html | 19 +++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 45d5ec1448..175d3ae26f 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -619,9 +619,11 @@ -ms-flex-direction: column; flex-direction: column; - .col { - width: 100%; + .col, .col-10, .col-20, .col-25, .col-33, .col-34, .col-50, .col-66, .col-67, .col-75, .col-80, .col-90 { + @include flex(1); margin-bottom: ($grid-padding-width * 3) / 2; + max-width: 100%; + width: 100%; } } } diff --git a/test/html/grid.html b/test/html/grid.html index f168ce207d..0a3e937ff4 100644 --- a/test/html/grid.html +++ b/test/html/grid.html @@ -89,7 +89,7 @@
- .col.col-25 + .col.col-25
@@ -261,24 +261,19 @@
-
+
- .responsive-lg .col + .responsive-lg .col.col-50
-
+
- .responsive-lg .col + .responsive-lg .col.col-25
-
+
- .responsive-lg .col -
-
-
-
- .responsive-lg .col + .responsive-lg .col.col-25