Ugh, Sass doesn't do extends across media, so we can't use placeholder here

3 files changed, 5 insertions, 21 deletions

diff --git a/scss/_grid.scss b/scss/_grid.scss
index 6da25b122..24cf74dda 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -30,23 +30,10 @@
   }
 }
 
-
 // Columns
 //
 // Common styles for small and large grid columns
 
 @if $enable-grid-classes {
-  [class^="col"] {
-    position: relative;
-    min-height: 1px;
-    padding-right: ($grid-gutter-width / 2);
-    padding-left: ($grid-gutter-width / 2);
-    // 
-    // // Allow `.col` to use an automatic, even width when flex mode is enabled
-    // @if $enable-flex {
-    //   flex: 1;
-    // }
-  }
-
   @include make-grid-columns();
 }
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index 68ff9c4bc..6009c4343 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -10,10 +10,13 @@
     @include media-breakpoint-up($breakpoint, $breakpoints) {
       @if $enable-flex {
         .col-#{$breakpoint} {
-          @extend column-basics; // Relative position, min-height, and horizontal padding
+          position: relative;
           max-width: 100%;
+          min-height: 1px;
           flex-basis: 0;
           flex-grow: 1;
+          padding-right: ($grid-gutter-width / 2);
+          padding-left:  ($grid-gutter-width / 2);
         }
       }
 
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 51f9a175e..6e67f92cd 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -33,17 +33,11 @@
   margin-right: ($gutter / -2);
 }
 
-// Used here for `make-col` and in the `grid-framework` for generating
-// predefined grid classes.
-%column-basics {
+@mixin make-col($size, $columns: $grid-columns) {
   position: relative;
   min-height: 1px;
   padding-right: ($grid-gutter-width / 2);
   padding-left:  ($grid-gutter-width / 2);
-}
-
-@mixin make-col($size, $columns: $grid-columns) {
-  @extend column-basics;
 
   @if $enable-flex {
     flex: 0 0 percentage($size / $columns);