Properly extend .column by .columns in flex grid, closes #7658

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index ff7024f1ed427905af1ee295207665582345d0a9..3e2efe5f55b55494f0c1f20f9724de71c1f7933b 100644 (file)
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -186,15 +186,10 @@ $-zf-flex-align: (
   }
 
   // Column
-  %flex-column {
+  .column {
     @include flex-grid-column;
   }
 
-  .column,
-  .columns {
-    @extend %flex-column;
-  }
-
   @include -zf-each-breakpoint {
     @for $i from 1 through $grid-column-count {
       // Sizing (percentage)
@@ -278,4 +273,9 @@ $-zf-flex-align: (
       @include flex-grid-column-align($vdir);
     }
   }
+
+  .columns {
+    // scss-lint:disable PlaceholderInExtend
+    @extend .column;
+  }
 }