Handle relative paths properly, when @importing.

ether · Sep 9, 2016 · 0a9d025 · 0a9d025
1 parent d7940cf
commit 0a9d025
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
@@ -409,7 +409,8 @@ function compressJS(content)
 function compressCSS(filename, content, callback)
 {
   try {
-    new CleanCSS({relativeTo: ROOT_DIR}).minify(content, function (errors, minified) {
+    var base = path.join(ROOT_DIR, path.dirname(filename));
+    new CleanCSS({relativeTo: base}).minify(content, function (errors, minified) {
       if (errors) {
         // On error, just yield the un-minified original.
         callback(null, content);

diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css
@@ -2,7 +2,7 @@
    Also see inner.css, included only in the inner one.
 */
 
-@import url('css/lists_and_indents.css');
+@import url('./lists_and_indents.css');
 
 html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
 span { cursor: auto; }

diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css
@@ -1,4 +1,4 @@
-@import url('css/lists_and_indents.css');
+@import url('./lists_and_indents.css');
 
 p.pblort {
   height: 100px;