Skip to content

Commit

Permalink
Merge pull request #19 from 21TORR/nullable-media-query
Browse files Browse the repository at this point in the history
Allow nullable media queries
  • Loading branch information
apfelbox authored Mar 8, 2021
2 parents 90a518f + 0ff04ed commit 8995166
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 19 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.5.1
=====

* (improvement) Allow nullable media query (which will just compile away).


0.5.0
=====

Expand Down
16 changes: 9 additions & 7 deletions mixins/media-query.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,18 @@
}

@if (list.length($list) == 0) {
@error "Can't create empty media query list";
@content;
}
@else {
$query: "screen";

$query: "screen";
@each $entry in $list {
$query: string.unquote("#{$query} and #{$entry}");
}

@each $entry in $list {
$query: string.unquote("#{$query} and #{$entry}");
@media #{$query} {
@content;
}
}

@media #{$query} {
@content;
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"devDependencies": {
"@types/node": "^14.14.6",
"@types/sass": "^1.16.0",
"ava": "^3.13.0",
"ava": "^3.15.0",
"esm": "^3.2.25",
"sass": "^1.28.0"
},
Expand Down
20 changes: 9 additions & 11 deletions tests/mixins/media-query/on-media.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,17 @@ test("on-media: Different parameter variations", t => {


test("on-media: empty", t => {
const error = t.throws(
() => compileScss(`
@use "mixins/media-query";
@include media-query.on-media() {
a {
color: red;
}
const css = compileScss(`
@use "mixins/media-query";
@include media-query.on-media() {
a {
color: red;
}
`)
);
}
`);

t.regex(error.message, new RegExp(`Can't create empty media query list`));
t.is(css, `a{color:red}`);
});


Expand Down

0 comments on commit 8995166

Please sign in to comment.