diff --git a/src/language-css/clean.js b/src/language-css/clean.js index a3ad6776c..6bf25236f 100644 --- a/src/language-css/clean.js +++ b/src/language-css/clean.js @@ -92,6 +92,12 @@ function clean(ast, newObj) { } ); } + + if (ast.type === "media-url") { + newObj.value = newObj.value + .replace(/^url\(\s+/gi, "url(") + .replace(/\s+\)$/gi, ")"); + } } function cleanCSSStrings(value) { diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js index 1a1b97a02..3a55f77c1 100644 --- a/src/language-css/printer-postcss.js +++ b/src/language-css/printer-postcss.js @@ -218,7 +218,10 @@ function genericPrint(path, options, print) { return adjustStrings(n.value, options); } case "media-url": { - return adjustStrings(n.value, options); + return adjustStrings( + n.value.replace(/^url\(\s+/gi, "url(").replace(/\s+\)$/gi, ")"), + options + ); } case "media-unknown": { return adjustStrings(n.value, options); diff --git a/tests/css_import/__snapshots__/jsfmt.spec.js.snap b/tests/css_import/__snapshots__/jsfmt.spec.js.snap index da4c65ddc..1c59fed87 100644 --- a/tests/css_import/__snapshots__/jsfmt.spec.js.snap +++ b/tests/css_import/__snapshots__/jsfmt.spec.js.snap @@ -63,6 +63,16 @@ $dir: 'fonts'; @import 'rounded-corners', 'text-shadow'; $family: unquote("Droid+Sans"); @import url("http://fonts.googleapis.com/css?family=#{$family}"); +@import url( "foo.css"); +@import url("foo.css" ); +@import url( "foo.css" ); +@import url( "foo.css" ); +@import url("foo bar baz.css"); +@import url( "foo bar baz.css" ); +@import url("foo bar baz.css"); +@import url( +"foo.css" +); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @import url("foo"); $dir: "fonts"; @@ -89,5 +99,13 @@ $dir: "fonts"; @import "rounded-corners", "text-shadow"; $family: unquote("Droid+Sans"); @import url("http://fonts.googleapis.com/css?family=#{$family}"); +@import url("foo.css"); +@import url("foo.css"); +@import url("foo.css"); +@import url("foo.css"); +@import url("foo bar baz.css"); +@import url("foo bar baz.css"); +@import url("foo bar baz.css"); +@import url("foo.css"); `; diff --git a/tests/css_import/url.css b/tests/css_import/url.css index 4f9ac04fd..d5704e8e6 100644 --- a/tests/css_import/url.css +++ b/tests/css_import/url.css @@ -24,3 +24,13 @@ $dir: 'fonts'; @import 'rounded-corners', 'text-shadow'; $family: unquote("Droid+Sans"); @import url("http://fonts.googleapis.com/css?family=#{$family}"); +@import url( "foo.css"); +@import url("foo.css" ); +@import url( "foo.css" ); +@import url( "foo.css" ); +@import url("foo bar baz.css"); +@import url( "foo bar baz.css" ); +@import url("foo bar baz.css"); +@import url( +"foo.css" +);