From 7633d4c603d916bb2174dd5a6d4063449088caef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 22:13:58 -0700 Subject: Make predefined grid classes conditional - Add explicit -grid-classes variable and set to true by default - Wrap .row and .col generation in the boolean var --- scss/_grid.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'scss/_grid.scss') diff --git a/scss/_grid.scss b/scss/_grid.scss index b71d5b03d..c0988f732 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -28,8 +28,10 @@ // // Rows contain and clear the floats of your columns. -.row { - @include make-row(); +@if $enable-grid-classes { + .row { + @include make-row(); + } } @@ -37,14 +39,16 @@ // // Common styles for small and large grid columns -@include make-grid-columns(); +@if $enable-grid-classes { + @include make-grid-columns(); +} // Flex variation // // Custom styles for additional flex alignment options. -@if $enable-flex { +@if $enable-flex and $enable-grid-classes { // Flex column reordering -- cgit v1.2.3 From c42d0e10f4c42f8fe21da0abc07a95ff99bf50c1 Mon Sep 17 00:00:00 2001 From: O'meid Date: Thu, 27 Aug 2015 15:56:46 +1000 Subject: scss: semantic grid: add make-container-breakpoint Signed-off-by: O'meid --- scss/_grid.scss | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'scss/_grid.scss') diff --git a/scss/_grid.scss b/scss/_grid.scss index b71d5b03d..1841b7faa 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -4,13 +4,8 @@ .container { @include make-container(); + @include make-container-max-widths(); - // For each breakpoint, define the maximum width of the container in a media query - @each $breakpoint, $container-max-width in $container-max-widths { - @include media-breakpoint-up($breakpoint) { - max-width: $container-max-width; - } - } } -- cgit v1.2.3