Skip to content
This repository was archived by the owner on Jul 18, 2024. It is now read-only.

Commit d47f72d

Browse files
seejamescodeseejamescode
authored
Merge pull request #28 from IBM/fixes
fix(bleed): Negative margins interpolated incorrectly for decimals
2 parents 78a2a8f + 17d3cc2 commit d47f72d

File tree

9 files changed

+35
-25
lines changed

9 files changed

+35
-25
lines changed

‎examples/bootstrap/css-gridish/bootstrap-grid.sketch‎

0 Bytes
Binary file not shown.

‎examples/bootstrap/css-gridish/scss/_mixins.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@
212212
padding-left: calc(#{$maxBleed} * -1 + #{$margin});
213213
padding-right: calc(#{$maxBleed} * -1 + #{$margin});
214214
} @else {
215-
margin-left: -$margin;
216-
margin-right: -$margin;
215+
margin-left: -#{$margin};
216+
margin-right: -#{$margin};
217217
padding-left: $margin;
218218
padding-right: $margin;
219219
}
@@ -222,21 +222,21 @@
222222

223223
.#{$prefix}-grid--bleed--left {
224224
padding-left: $margin;
225-
margin-left: -$margin;
225+
margin-left: -#{$margin};
226226
}
227227

228228
.#{$prefix}-grid--bleed--right {
229229
padding-right: $margin;
230-
margin-right: -$margin;
230+
margin-right: -#{$margin};
231231
}
232232

233233
@include gridLegacyWrapper($includeFlexFallback) {
234234
.#{$prefix}-grid__break--left {
235-
margin-left: -$margin;
235+
margin-left: -#{$margin};
236236
}
237237

238238
.#{$prefix}-grid__break--right {
239-
margin-right: -$margin;
239+
margin-right: -#{$margin};
240240
}
241241
}
242242
}

‎examples/carbon/css-gridish/bx-grid.sketch‎

0 Bytes
Binary file not shown.

‎examples/carbon/css-gridish/scss/_mixins.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@
212212
padding-left: calc(#{$maxBleed} * -1 + #{$margin});
213213
padding-right: calc(#{$maxBleed} * -1 + #{$margin});
214214
} @else {
215-
margin-left: -$margin;
216-
margin-right: -$margin;
215+
margin-left: -#{$margin};
216+
margin-right: -#{$margin};
217217
padding-left: $margin;
218218
padding-right: $margin;
219219
}
@@ -222,21 +222,21 @@
222222

223223
.#{$prefix}-grid--bleed--left {
224224
padding-left: $margin;
225-
margin-left: -$margin;
225+
margin-left: -#{$margin};
226226
}
227227

228228
.#{$prefix}-grid--bleed--right {
229229
padding-right: $margin;
230-
margin-right: -$margin;
230+
margin-right: -#{$margin};
231231
}
232232

233233
@include gridLegacyWrapper($includeFlexFallback) {
234234
.#{$prefix}-grid__break--left {
235-
margin-left: -$margin;
235+
margin-left: -#{$margin};
236236
}
237237

238238
.#{$prefix}-grid__break--right {
239-
margin-right: -$margin;
239+
margin-right: -#{$margin};
240240
}
241241
}
242242
}

‎examples/material/css-gridish/material-grid.sketch‎

0 Bytes
Binary file not shown.

‎examples/material/css-gridish/scss/_mixins.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@
212212
padding-left: calc(#{$maxBleed} * -1 + #{$margin});
213213
padding-right: calc(#{$maxBleed} * -1 + #{$margin});
214214
} @else {
215-
margin-left: -$margin;
216-
margin-right: -$margin;
215+
margin-left: -#{$margin};
216+
margin-right: -#{$margin};
217217
padding-left: $margin;
218218
padding-right: $margin;
219219
}
@@ -222,21 +222,21 @@
222222

223223
.#{$prefix}-grid--bleed--left {
224224
padding-left: $margin;
225-
margin-left: -$margin;
225+
margin-left: -#{$margin};
226226
}
227227

228228
.#{$prefix}-grid--bleed--right {
229229
padding-right: $margin;
230-
margin-right: -$margin;
230+
margin-right: -#{$margin};
231231
}
232232

233233
@include gridLegacyWrapper($includeFlexFallback) {
234234
.#{$prefix}-grid__break--left {
235-
margin-left: -$margin;
235+
margin-left: -#{$margin};
236236
}
237237

238238
.#{$prefix}-grid__break--right {
239-
margin-right: -$margin;
239+
margin-right: -#{$margin};
240240
}
241241
}
242242
}

‎gulpfile.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@ gulp.task("build", function() {
88
return run("npm run build").exec();
99
});
1010

11+
gulp.task("build:examples", function() {
12+
return run("npm run build:examples").exec();
13+
});
14+
1115
gulp.task("refresh", ["build"], function(done) {
1216
browserSync.reload();
1317
done();
1418
});
1519

20+
gulp.task("refresh:examples", ["build:examples"], function(done) {
21+
browserSync.reload();
22+
done();
23+
});
24+
1625
gulp.task("watch", function() {
1726
browserSync.init({
1827
server: {
@@ -22,4 +31,5 @@ gulp.task("watch", function() {
2231

2332
gulp.watch(["**/*.html"]).on("change", browserSync.reload);
2433
gulp.watch("src/**/*", ["refresh"]);
34+
gulp.watch("examples/**/*.json", ["refresh:examples"]);
2535
});

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "css-gridish",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description":
55
"Automatically build your grid design’s CSS Grid code, CSS Flexbox fallback code, Sketch artboards, and Chrome extension.",
66
"engines": {

‎src/scss/_mixins.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@
212212
padding-left: calc(#{$maxBleed} * -1 + #{$margin});
213213
padding-right: calc(#{$maxBleed} * -1 + #{$margin});
214214
} @else {
215-
margin-left: -$margin;
216-
margin-right: -$margin;
215+
margin-left: -#{$margin};
216+
margin-right: -#{$margin};
217217
padding-left: $margin;
218218
padding-right: $margin;
219219
}
@@ -222,21 +222,21 @@
222222

223223
.#{$prefix}-grid--bleed--left {
224224
padding-left: $margin;
225-
margin-left: -$margin;
225+
margin-left: -#{$margin};
226226
}
227227

228228
.#{$prefix}-grid--bleed--right {
229229
padding-right: $margin;
230-
margin-right: -$margin;
230+
margin-right: -#{$margin};
231231
}
232232

233233
@include gridLegacyWrapper($includeFlexFallback) {
234234
.#{$prefix}-grid__break--left {
235-
margin-left: -$margin;
235+
margin-left: -#{$margin};
236236
}
237237

238238
.#{$prefix}-grid__break--right {
239-
margin-right: -$margin;
239+
margin-right: -#{$margin};
240240
}
241241
}
242242
}

0 commit comments

Comments
 (0)