From 0a9d02562d7e14ecc9f9f1d929a65cc64924857a Mon Sep 17 00:00:00 2001 From: Dan Bornstein Date: Fri, 9 Sep 2016 12:59:02 -0700 Subject: [PATCH] Handle relative paths properly, when `@import`ing. --- src/node/utils/Minify.js | 3 ++- src/static/css/iframe_editor.css | 2 +- src/static/css/timeslider.css | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 101dc97a1..806523105 100644 --- 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 index 5eb94cf79..9aa003aaf 100644 --- 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 index c2e8aea7a..0311b10ee 100644 --- 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;