From 207a1b374d625e6af7bc639a29fa036a128b023f Mon Sep 17 00:00:00 2001 From: Geoff Kimball Date: Mon, 28 Mar 2016 10:34:47 -0700 Subject: [PATCH] Apply display: block; to flex grid items with .row and .column, so the content inside flows properly --- scss/grid/_flex-grid.scss | 1 + test/visual/flex-grid/column-row.html | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 test/visual/flex-grid/column-row.html diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss index 1dcf34e8b..dd5e235cb 100644 --- a/scss/grid/_flex-grid.scss +++ b/scss/grid/_flex-grid.scss @@ -173,6 +173,7 @@ // The double .row class is needed to bump up the specificity .column.row.row { float: none; + display: block; // To properly nest a column row, padding and margin is removed .row & { diff --git a/test/visual/flex-grid/column-row.html b/test/visual/flex-grid/column-row.html new file mode 100644 index 000000000..5f40c4a12 --- /dev/null +++ b/test/visual/flex-grid/column-row.html @@ -0,0 +1,25 @@ + + + + + + + Foundation for Sites Testing + + + +

Flex Grid: Column Row

+ +

This text is inside a combined column/row.

+ +

An element with the classes .row and .column should have display: block and not display: flex, so the elements inside flow normally.

+ + + + + + -- 2.47.2