From eed0450351451fa409b8d2c81b8dde9e8702036a Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 5 Jun 2012 18:09:32 +0200 Subject: [PATCH] Fix remap dir for CSS minimizer --- core/css/styles.css | 2 +- lib/minimizer/css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 186c11b4ff..b6b5918d65 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -134,7 +134,7 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; } li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; } -.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;} +.hint { background-image: url('../img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;} .separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; } a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px } diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php index 3d1196390e..4637417579 100644 --- a/lib/minimizer/css.php +++ b/lib/minimizer/css.php @@ -63,7 +63,7 @@ class OC_Minimizer_CSS extends OC_Minimizer $css = str_replace('%webroot%', $webroot, $css); } $remote = $file_info[1]; - $remote .= '../'; + $remote .= '/'; $remote .= dirname($file_info[2]); $css_out .= CSSMin::remap($css, dirname($file), $remote, true); }