fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle relative paths properly, when `@import`ing.

This commit is contained in:
Dan Bornstein 2016-09-09 12:59:02 -07:00
parent d7940cf8c5
commit 0a9d02562d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/node/utils/Minify.js
View File

@ -409,7 +409,8 @@ function compressJS(content)
function compressCSS(filename, content, callback) function compressCSS(filename, content, callback)
{ {
try { 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) { if (errors) {
// On error, just yield the un-minified original. // On error, just yield the un-minified original.
callback(null, content); callback(null, content);

2
src/static/css/iframe_editor.css
View File

@ -2,7 +2,7 @@
Also see inner.css, included only in the inner one. 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) */ html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
span { cursor: auto; } span { cursor: auto; }

2
src/static/css/timeslider.css
View File

@ -1,4 +1,4 @@
@import url('css/lists_and_indents.css'); @import url('./lists_and_indents.css');
p.pblort { p.pblort {
height: 100px; height: 100px;