From e7b57a22b204084a9e9974f92043f63e69a0a052 Mon Sep 17 00:00:00 2001 From: Laurent Falda Date: Thu, 16 Nov 2017 10:32:15 +0100 Subject: [PATCH 1/3] added gridlex breakpoints for isolating the breakpoints in order to facilitate modification externally --- src/gridlex-breakpoints.scss | 5 +++++ src/{gridlex.scss => gridlex-classes.scss} | 0 src/gridlex-master.scss | 3 +++ src/gridlex-vars.scss | 16 ++++++++-------- 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 src/gridlex-breakpoints.scss rename src/{gridlex.scss => gridlex-classes.scss} (100%) create mode 100644 src/gridlex-master.scss diff --git a/src/gridlex-breakpoints.scss b/src/gridlex-breakpoints.scss new file mode 100644 index 0000000..6fb9059 --- /dev/null +++ b/src/gridlex-breakpoints.scss @@ -0,0 +1,5 @@ +$gl-bp-lg: 80em; +$gl-bp-md: 64em; +$gl-bp-sm: 48em; +$gl-bp-xs: 36em; +$gl-bp-incre: 0.063em; diff --git a/src/gridlex.scss b/src/gridlex-classes.scss similarity index 100% rename from src/gridlex.scss rename to src/gridlex-classes.scss diff --git a/src/gridlex-master.scss b/src/gridlex-master.scss new file mode 100644 index 0000000..e81902f --- /dev/null +++ b/src/gridlex-master.scss @@ -0,0 +1,3 @@ +@import "gridlex-breakpoints"; +@import "gridlex-vars"; +@import "gridlex-classes"; \ No newline at end of file diff --git a/src/gridlex-vars.scss b/src/gridlex-vars.scss index ae0b2da..888aa2d 100644 --- a/src/gridlex-vars.scss +++ b/src/gridlex-vars.scss @@ -8,17 +8,17 @@ $gl-gutter: 1rem !default; // Total left + right $gl-gutter-vertical: 1rem !default; $gl-mq-list: ( - lg: "screen and (max-width: 80em)", // max 1280px - md: "screen and (max-width: 64em)", // max 1024px - sm: "screen and (max-width: 48em)", // max 768px - xs: "screen and (max-width: 36em)" // up to 576px + lg: "screen and (max-width: #{$gl-bp-lg})", // max 1280px + md: "screen and (max-width: #{$gl-bp-md})", // max 1024px + sm: "screen and (max-width: #{$gl-bp-sm})", // max 768px + xs: "screen and (max-width: #{$gl-bp-xs})" // up to 576px ) !default; $gl-mq-list-min-max: ( - lg: "screen and (min-width: (64em+0.063em)) and (max-width: 80em)", - md: "screen and (min-width: (48em+0.063em)) and (max-width: 64em)", - sm: "screen and (min-width: (36rem+0.063em)) and (max-width: 48em)", - xs: "screen and (max-width: 36rem)" // up to 576px + lg: "screen and (min-width: (#{$gl-bp-md}+#{$gl-bp-incre})) and (max-width: #{$gl-bp-lg})", + md: "screen and (min-width: (#{$gl-bp-sm}+#{$gl-bp-incre})) and (max-width: #{$gl-bp-md})", + sm: "screen and (min-width: (#{$gl-bp-xs}+#{$gl-bp-incre})) and (max-width: #{$gl-bp-sm})", + xs: "screen and (max-width: #{$gl-bp-xs})" // up to 576px ) !default; From db79489b5fb2d474776e771efc37e5670d47aa20 Mon Sep 17 00:00:00 2001 From: Laurent Falda Date: Thu, 16 Nov 2017 10:35:13 +0100 Subject: [PATCH 2/3] made gridlex entrypoint into an index-like file so you can easily import individual parts from your node_modules --- src/{gridlex-master.scss => gridlex.scss} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{gridlex-master.scss => gridlex.scss} (100%) diff --git a/src/gridlex-master.scss b/src/gridlex.scss similarity index 100% rename from src/gridlex-master.scss rename to src/gridlex.scss From 14a59bd8159cae8178845bc6d5e54797f2808c28 Mon Sep 17 00:00:00 2001 From: Laurent G Date: Thu, 16 Nov 2017 11:50:35 +0100 Subject: [PATCH 3/3] Remove comment `@each $mq-key, $mq-value in $gl-mq-list/*-min-max*/ {` to `@each $mq-key, $mq-value in $gl-mq-list{` `$gl-mq-list-min-max` is not used. --- src/gridlex-classes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gridlex-classes.scss b/src/gridlex-classes.scss index 119df1f..ecece45 100644 --- a/src/gridlex-classes.scss +++ b/src/gridlex-classes.scss @@ -173,7 +173,7 @@ /************************ HIDING COLS *************************/ -@each $mq-key, $mq-value in $gl-mq-list/*-min-max*/ { +@each $mq-key, $mq-value in $gl-mq-list{ @media #{$mq-value} { [#{$gl-attributeName}*="#{$mq-key}-hidden"] { display: none;