diff --git a/examples/bootstrap/css-gridish/bootstrap-grid.sketch b/examples/bootstrap/css-gridish/bootstrap-grid.sketch index 0623bac..796db5c 100644 Binary files a/examples/bootstrap/css-gridish/bootstrap-grid.sketch and b/examples/bootstrap/css-gridish/bootstrap-grid.sketch differ diff --git a/examples/bootstrap/css-gridish/scss/_mixins.scss b/examples/bootstrap/css-gridish/scss/_mixins.scss index 765f3f2..20af48f 100755 --- a/examples/bootstrap/css-gridish/scss/_mixins.scss +++ b/examples/bootstrap/css-gridish/scss/_mixins.scss @@ -212,8 +212,8 @@ padding-left: calc(#{$maxBleed} * -1 + #{$margin}); padding-right: calc(#{$maxBleed} * -1 + #{$margin}); } @else { - margin-left: -$margin; - margin-right: -$margin; + margin-left: -#{$margin}; + margin-right: -#{$margin}; padding-left: $margin; padding-right: $margin; } @@ -222,21 +222,21 @@ .#{$prefix}-grid--bleed--left { padding-left: $margin; - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid--bleed--right { padding-right: $margin; - margin-right: -$margin; + margin-right: -#{$margin}; } @include gridLegacyWrapper($includeFlexFallback) { .#{$prefix}-grid__break--left { - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid__break--right { - margin-right: -$margin; + margin-right: -#{$margin}; } } } diff --git a/examples/carbon/css-gridish/bx-grid.sketch b/examples/carbon/css-gridish/bx-grid.sketch index 701cb77..7ecae44 100644 Binary files a/examples/carbon/css-gridish/bx-grid.sketch and b/examples/carbon/css-gridish/bx-grid.sketch differ diff --git a/examples/carbon/css-gridish/scss/_mixins.scss b/examples/carbon/css-gridish/scss/_mixins.scss index 765f3f2..20af48f 100755 --- a/examples/carbon/css-gridish/scss/_mixins.scss +++ b/examples/carbon/css-gridish/scss/_mixins.scss @@ -212,8 +212,8 @@ padding-left: calc(#{$maxBleed} * -1 + #{$margin}); padding-right: calc(#{$maxBleed} * -1 + #{$margin}); } @else { - margin-left: -$margin; - margin-right: -$margin; + margin-left: -#{$margin}; + margin-right: -#{$margin}; padding-left: $margin; padding-right: $margin; } @@ -222,21 +222,21 @@ .#{$prefix}-grid--bleed--left { padding-left: $margin; - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid--bleed--right { padding-right: $margin; - margin-right: -$margin; + margin-right: -#{$margin}; } @include gridLegacyWrapper($includeFlexFallback) { .#{$prefix}-grid__break--left { - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid__break--right { - margin-right: -$margin; + margin-right: -#{$margin}; } } } diff --git a/examples/material/css-gridish/material-grid.sketch b/examples/material/css-gridish/material-grid.sketch index bd618b8..64bd654 100644 Binary files a/examples/material/css-gridish/material-grid.sketch and b/examples/material/css-gridish/material-grid.sketch differ diff --git a/examples/material/css-gridish/scss/_mixins.scss b/examples/material/css-gridish/scss/_mixins.scss index 765f3f2..20af48f 100755 --- a/examples/material/css-gridish/scss/_mixins.scss +++ b/examples/material/css-gridish/scss/_mixins.scss @@ -212,8 +212,8 @@ padding-left: calc(#{$maxBleed} * -1 + #{$margin}); padding-right: calc(#{$maxBleed} * -1 + #{$margin}); } @else { - margin-left: -$margin; - margin-right: -$margin; + margin-left: -#{$margin}; + margin-right: -#{$margin}; padding-left: $margin; padding-right: $margin; } @@ -222,21 +222,21 @@ .#{$prefix}-grid--bleed--left { padding-left: $margin; - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid--bleed--right { padding-right: $margin; - margin-right: -$margin; + margin-right: -#{$margin}; } @include gridLegacyWrapper($includeFlexFallback) { .#{$prefix}-grid__break--left { - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid__break--right { - margin-right: -$margin; + margin-right: -#{$margin}; } } } diff --git a/gulpfile.js b/gulpfile.js index 005e980..b2805a6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,11 +8,20 @@ gulp.task("build", function() { return run("npm run build").exec(); }); +gulp.task("build:examples", function() { + return run("npm run build:examples").exec(); +}); + gulp.task("refresh", ["build"], function(done) { browserSync.reload(); done(); }); +gulp.task("refresh:examples", ["build:examples"], function(done) { + browserSync.reload(); + done(); +}); + gulp.task("watch", function() { browserSync.init({ server: { @@ -22,4 +31,5 @@ gulp.task("watch", function() { gulp.watch(["**/*.html"]).on("change", browserSync.reload); gulp.watch("src/**/*", ["refresh"]); + gulp.watch("examples/**/*.json", ["refresh:examples"]); }); diff --git a/package.json b/package.json index e409954..4936161 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "css-gridish", - "version": "1.0.5", + "version": "1.0.6", "description": "Automatically build your grid design’s CSS Grid code, CSS Flexbox fallback code, Sketch artboards, and Chrome extension.", "engines": { diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss index 765f3f2..20af48f 100755 --- a/src/scss/_mixins.scss +++ b/src/scss/_mixins.scss @@ -212,8 +212,8 @@ padding-left: calc(#{$maxBleed} * -1 + #{$margin}); padding-right: calc(#{$maxBleed} * -1 + #{$margin}); } @else { - margin-left: -$margin; - margin-right: -$margin; + margin-left: -#{$margin}; + margin-right: -#{$margin}; padding-left: $margin; padding-right: $margin; } @@ -222,21 +222,21 @@ .#{$prefix}-grid--bleed--left { padding-left: $margin; - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid--bleed--right { padding-right: $margin; - margin-right: -$margin; + margin-right: -#{$margin}; } @include gridLegacyWrapper($includeFlexFallback) { .#{$prefix}-grid__break--left { - margin-left: -$margin; + margin-left: -#{$margin}; } .#{$prefix}-grid__break--right { - margin-right: -$margin; + margin-right: -#{$margin}; } } }