From e3776c06c37cc197709dac60892604dfea894ac2 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 29 Nov 2010 01:34:36 +0100
Subject: Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3

As of VIM 7.3 it is no longer possible to specify the encoding in the
modeline. This gives an error message whenever such a file is opened,
thus this commit removes the enc setting from the modeline.
---
 lib/exe/css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/exe/css.php')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 76f40c7bb..e64ebc22a 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -330,4 +330,4 @@ function css_comment_cb($matches){
     return $matches[0];
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From f7d780b9b82a664525120a90a8b1cb25be57d0e0 Mon Sep 17 00:00:00 2001
From: Gabriel Birke <gabriel.birke@gmail.com>
Date: Sun, 9 Jan 2011 13:18:19 +0100
Subject: Preserve @import statements in CSS

---
 lib/exe/css.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'lib/exe/css.php')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index e64ebc22a..eb2d96513 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -122,6 +122,9 @@ function css_out(){
 
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
+    
+    // place all @import statements at the top of the file
+    $css = css_moveimports($css);
 
     // compress whitespace and comments
     if($conf['compress']){
@@ -265,6 +268,7 @@ function css_loadfile($file,$location=''){
     if(!$location) return $css;
 
     $css = preg_replace('#(url\([ \'"]*)((?!/|http://|https://| |\'|"))#','\\1'.$location.'\\3',$css);
+    $css = preg_replace('#(@import\s+[\'"])((?!/|http://|https://))#', '\\1'.$location.'\\2"', $css);
     return $css;
 }
 
@@ -296,6 +300,29 @@ function css_pluginstyles($mode='screen'){
     return $list;
 }
 
+/**
+ * Move all @import statements in a combined stylesheet to the top so they
+ * aren't ignored by the browser. 
+ *
+ * @author Gabriel Birke <birke@d-scribe.de>
+ */
+function css_moveimports($css)
+{
+    if(!preg_match_all('/@import\s+(?:url\([^)]+\)|"[^"]+")\s*[^;]*;\s*/', $css, $matches, PREG_OFFSET_CAPTURE)) {
+        return $css;
+    }
+    $newCss  = "";
+    $imports = "";
+    $offset  = 0;
+    foreach($matches[0] as $match) {
+        $newCss  .= substr($css, $offset, $match[1] - $offset);
+        $imports .= $match[0];
+        $offset   = $match[1] + strlen($match[0]);
+    }
+    $newCss .= substr($css, $offset);
+    return $imports.$newCss;
+}
+
 /**
  * Very simple CSS optimizer
  *
-- 
cgit v1.2.3


From 6e0b4b67444b8434ed2c351ea0e36008667251d5 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 9 Jan 2011 14:52:50 +0100
Subject: Fixed css_loadfile and removed unneeded complexity, added testcases

---
 lib/exe/css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/exe/css.php')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index eb2d96513..4db81de0b 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -267,8 +267,8 @@ function css_loadfile($file,$location=''){
     $css = io_readFile($file);
     if(!$location) return $css;
 
-    $css = preg_replace('#(url\([ \'"]*)((?!/|http://|https://| |\'|"))#','\\1'.$location.'\\3',$css);
-    $css = preg_replace('#(@import\s+[\'"])((?!/|http://|https://))#', '\\1'.$location.'\\2"', $css);
+    $css = preg_replace('#(url\([ \'"]*)(?!/|http://|https://| |\'|")#','\\1'.$location,$css);
+    $css = preg_replace('#(@import\s+[\'"])(?!/|http://|https://)#', '\\1'.$location, $css);
     return $css;
 }
 
-- 
cgit v1.2.3