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

Commit 1e917a0

Browse files
committed
fix(scss): let custom prefix from scss variable override Gridish config prefix
1 parent cb16126 commit 1e917a0

File tree

8 files changed

+53
-13
lines changed

8 files changed

+53
-13
lines changed
Binary file not shown.
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "values";
22

33
$prefix: gridish !default;
4-
@if map-get($grid-values, "prefix") {
4+
@if map-get($grid-values, "prefix") and $prefix == "gridish" {
55
$prefix: map-get($grid-values, "prefix");
66
}
77
$extraBreakpoints: () !default;
@@ -12,5 +12,15 @@ $includeFlexFallback: false !default;
1212
$rowHeight: map-get($grid-values, "rowHeight");
1313
$rows: map-get($grid-values, "rows");
1414
$extraArtboards: map-get($grid-values, "extraArtboards");
15-
$allBreakpoints: all-breakpoints($breakpoints, $extraBreakpoints, $first, $last);
16-
$breakpointsAndArtboards: all-breakpoints($breakpoints, $extraArtboards, $first, $last);
15+
$allBreakpoints: all-breakpoints(
16+
$breakpoints,
17+
$extraBreakpoints,
18+
$first,
19+
$last
20+
);
21+
$breakpointsAndArtboards: all-breakpoints(
22+
$breakpoints,
23+
$extraArtboards,
24+
$first,
25+
$last
26+
);
0 Bytes
Binary file not shown.
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "values";
22

33
$prefix: gridish !default;
4-
@if map-get($grid-values, "prefix") {
4+
@if map-get($grid-values, "prefix") and $prefix == "gridish" {
55
$prefix: map-get($grid-values, "prefix");
66
}
77
$extraBreakpoints: () !default;
@@ -12,5 +12,15 @@ $includeFlexFallback: false !default;
1212
$rowHeight: map-get($grid-values, "rowHeight");
1313
$rows: map-get($grid-values, "rows");
1414
$extraArtboards: map-get($grid-values, "extraArtboards");
15-
$allBreakpoints: all-breakpoints($breakpoints, $extraBreakpoints, $first, $last);
16-
$breakpointsAndArtboards: all-breakpoints($breakpoints, $extraArtboards, $first, $last);
15+
$allBreakpoints: all-breakpoints(
16+
$breakpoints,
17+
$extraBreakpoints,
18+
$first,
19+
$last
20+
);
21+
$breakpointsAndArtboards: all-breakpoints(
22+
$breakpoints,
23+
$extraArtboards,
24+
$first,
25+
$last
26+
);
Binary file not shown.
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "values";
22

33
$prefix: gridish !default;
4-
@if map-get($grid-values, "prefix") {
4+
@if map-get($grid-values, "prefix") and $prefix == "gridish" {
55
$prefix: map-get($grid-values, "prefix");
66
}
77
$extraBreakpoints: () !default;
@@ -12,5 +12,15 @@ $includeFlexFallback: false !default;
1212
$rowHeight: map-get($grid-values, "rowHeight");
1313
$rows: map-get($grid-values, "rows");
1414
$extraArtboards: map-get($grid-values, "extraArtboards");
15-
$allBreakpoints: all-breakpoints($breakpoints, $extraBreakpoints, $first, $last);
16-
$breakpointsAndArtboards: all-breakpoints($breakpoints, $extraArtboards, $first, $last);
15+
$allBreakpoints: all-breakpoints(
16+
$breakpoints,
17+
$extraBreakpoints,
18+
$first,
19+
$last
20+
);
21+
$breakpointsAndArtboards: all-breakpoints(
22+
$breakpoints,
23+
$extraArtboards,
24+
$first,
25+
$last
26+
);

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": "2.0.0-beta.1",
3+
"version": "2.0.0-beta.2",
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/_variables.scss

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "values";
22

33
$prefix: gridish !default;
4-
@if map-get($grid-values, "prefix") {
4+
@if map-get($grid-values, "prefix") and $prefix == "gridish" {
55
$prefix: map-get($grid-values, "prefix");
66
}
77
$extraBreakpoints: () !default;
@@ -12,5 +12,15 @@ $includeFlexFallback: false !default;
1212
$rowHeight: map-get($grid-values, "rowHeight");
1313
$rows: map-get($grid-values, "rows");
1414
$extraArtboards: map-get($grid-values, "extraArtboards");
15-
$allBreakpoints: all-breakpoints($breakpoints, $extraBreakpoints, $first, $last);
16-
$breakpointsAndArtboards: all-breakpoints($breakpoints, $extraArtboards, $first, $last);
15+
$allBreakpoints: all-breakpoints(
16+
$breakpoints,
17+
$extraBreakpoints,
18+
$first,
19+
$last
20+
);
21+
$breakpointsAndArtboards: all-breakpoints(
22+
$breakpoints,
23+
$extraArtboards,
24+
$first,
25+
$last
26+
);

0 commit comments

Comments
 (0)