X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=www%2Fplugins-dist%2Fcompresseur%2Flib%2Fcsstidy%2Fclass.csstidy_optimise.php;h=1ceb21fceb63808dbe122c2d4f096dad5a7c153d;hb=9bbff73a71a636a626a1be365cbf48c07f1f7220;hp=d42341ce78efd5a68bd27431f36685fecf149b29;hpb=8310d65063cd6c3198978cb61b71643feb4812cc;p=lhc%2Fweb%2Fwww.git

diff --git a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
index d42341ce..1ceb21fc 100644
--- a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
+++ b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
@@ -269,7 +269,8 @@ class csstidy_optimise {
 	 */
 	public function compress_important(&$string) {
 		if ($this->parser->is_important($string)) {
-			$string = $this->parser->gvw_important($string) . '!important';
+			$important = $this->parser->get_cfg('space_before_important') ? ' !important' : '!important';
+			$string = $this->parser->gvw_important($string) . $important;
 		}
 		return $string;
 	}
@@ -899,7 +900,7 @@ class csstidy_optimise {
 		$new_font_value = '';
 		$important = '';
 		// Skip if not font-family and font-size set
-		if (isset($input_css['font-family']) && isset($input_css['font-size'])) {
+		if (isset($input_css['font-family']) && isset($input_css['font-size']) && $input_css['font-family'] != 'inherit') {
 			// fix several words in font-family - add quotes
 			if (isset($input_css['font-family'])) {
 				$families = explode(',', $input_css['font-family']);