From 24a79891508533ca93eda36dafa30c77ff9d4be8 Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 4 Oct 2018 12:53:16 +0200 Subject: [PATCH 1/2] Removed the dependency that the $full-grid option had on the @custom-media queries so that the $full-grid option is also available when NOT using the concise.css compiler --- src/_atgrid.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/_atgrid.scss b/src/_atgrid.scss index d5ca4fd..42211a9 100644 --- a/src/_atgrid.scss +++ b/src/_atgrid.scss @@ -16,16 +16,16 @@ @if($enable-container-solid) { [#{$prefix}container~="solid"] { - @media(--small) { + @media(min-width: #{$break-small}) { // (width >= #{$break-small}); max-width: $break-small; } - @media(--medium) { + @media(min-width: #{$break-medium}) { // (width >= #{$break-medium}); max-width: $break-medium; } - @media(--large) { + @media(min-width: #{$break-large}) { // (width >= #{$break-large}); max-width: $break-large; } - @media(--extra-large) { + @media(min-width: #{$break-extra-large}) { // (width >= #{$break-extra-large}); max-width: $container-width; } } @@ -145,7 +145,7 @@ } @if ($full-grid) { - @media (--extra-small) { + @media (max-width: #{$break-small - 1}) { // (width < #{$break-small}); // // Column widths // @@ -166,7 +166,7 @@ } } - @media (--small) { + @media (min-width: #{$break-small}) { // (width >= #{$break-small}); // // Column widths // @@ -187,7 +187,7 @@ } } - @media (--medium) { + @media (min-width: #{$break-medium}) { // (width >= #{$break-medium} // // Column widths // @@ -208,7 +208,7 @@ } } - @media (--large) { + @media (min-width: #{$break-large}) { // (width >= #{$break-large}); // // Column widths // @@ -229,7 +229,7 @@ } } - @media (--extra-large) { + @media (min-width: #{$break-extra-large}) { // (width >= #{$break-extra-large}); // // Column widths // From 166a6a8386f9e415aee88ab446132a4bbfab5092 Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 4 Oct 2018 16:33:01 +0200 Subject: [PATCH 2/2] Made the s, m, l, xl breakpoints overridable --- globals/_settings.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/globals/_settings.scss b/globals/_settings.scss index 50eb5a0..2a89969 100644 --- a/globals/_settings.scss +++ b/globals/_settings.scss @@ -29,10 +29,10 @@ $block-margin: 1lh !default; $transition-duration: 150ms !default; // Break points -$break-small: 480px; -$break-medium: 768px; -$break-large: 960px; -$break-extra-large: 1100px; +$break-small: 480px !default; +$break-medium: 768px !default; +$break-large: 960px !default; +$break-extra-large: 1100px !default; // Custom media queries // Use as @media (--medium) { … }