From d91ab76f52f59d264301e18c28a0d3bae996fab8 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 27 Aug 2013 01:18:10 -0700
Subject: Fix CodeSniffer violations

Fix violations for the following sniff
DokuWiki.Functions.OpeningFunctionBrace

Also removed an extraneous semicolon.
---
 lib/exe/css.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 9e1e22e1a..60e17ae82 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -465,8 +465,7 @@ function css_pluginstyles($mediatype='screen'){
  *
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function css_moveimports($css)
-{
+function css_moveimports($css) {
     if(!preg_match_all('/@import\s+(?:url\([^)]+\)|"[^"]+")\s*[^;]*;\s*/', $css, $matches, PREG_OFFSET_CAPTURE)) {
         return $css;
     }
-- 
cgit v1.2.3


From 9c7a681b5de7bebb468569a1a416000935b3b3d7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 12 Oct 2013 18:56:40 +0200
Subject: removed css_moveimports() this is now done by lessphp

---
 lib/exe/css.php | 25 -------------------------
 1 file changed, 25 deletions(-)

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

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 60e17ae82..afba5fc02 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -148,9 +148,6 @@ function css_out(){
     // parse less
     $css = css_parseless($css);
 
-    // place all remaining @import statements at the top of the file
-    $css = css_moveimports($css);
-
     // compress whitespace and comments
     if($conf['compress']){
         $css = css_compress($css);
@@ -459,28 +456,6 @@ function css_pluginstyles($mediatype='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 205907a73eaf15c53de98f153e90890706e79cbe Mon Sep 17 00:00:00 2001
From: furun <furun@arcor.de>
Date: Tue, 15 Oct 2013 11:34:31 +0200
Subject: compact some CSS styles to their shorthand syntax FS#2509

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

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

diff --git a/lib/exe/css.php b/lib/exe/css.php
index afba5fc02..6dfdf06e8 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -473,8 +473,19 @@ function css_compress($css){
     $css = preg_replace('/ ?([;,{}\/]) ?/','\\1',$css);
     $css = preg_replace('/ ?: /',':',$css);
 
+    // number compression
+    $css = preg_replace('/([: ])0+(\.\d+?)0*((?:pt|pc|in|mm|cm|em|ex|px)\b|%)(?=[^\{]*[;\}])/', '$1$2$3', $css); // "0.1em" to ".1em", "1.10em" to "1.1em"
+    $css = preg_replace('/([: ])\.(0)+((?:pt|pc|in|mm|cm|em|ex|px)\b|%)(?=[^\{]*[;\}])/', '$1$2', $css); // ".0em" to "0"
+    $css = preg_replace('/([: ]0)0*(\.0*)?((?:pt|pc|in|mm|cm|em|ex|px)(?=[^\{]*[;\}])\b|%)/', '$1', $css); // "0.0em" to "0"
+    $css = preg_replace('/([: ]\d+)(\.0*)((?:pt|pc|in|mm|cm|em|ex|px)(?=[^\{]*[;\}])\b|%)/', '$1$3', $css); // "1.0em" to "1em"
+    $css = preg_replace('/([: ])0+(\d+|\d*\.\d+)((?:pt|pc|in|mm|cm|em|ex|px)(?=[^\{]*[;\}])\b|%)/', '$1$2$3', $css); // "001em" to "1em"
+
+    // shorten attributes (1em 1em 1em 1em -> 1em)
+    $css = preg_replace('/(?<![\w\-])((?:margin|padding|border|border-(?:width|radius)):)([\w\.]+)( \2)+(?=[;\}]| !)/', '$1$2', $css); // "1em 1em 1em 1em" to "1em"
+    $css = preg_replace('/(?<![\w\-])((?:margin|padding|border|border-(?:width)):)([\w\.]+) ([\w\.]+) \2 \3(?=[;\}]| !)/', '$1$2 $3', $css); // "1em 2em 1em 2em" to "1em 2em"
+
     // shorten colors
-    $css = preg_replace("/#([0-9a-fA-F]{1})\\1([0-9a-fA-F]{1})\\2([0-9a-fA-F]{1})\\3/", "#\\1\\2\\3",$css);
+    $css = preg_replace("/#([0-9a-fA-F]{1})\\1([0-9a-fA-F]{1})\\2([0-9a-fA-F]{1})\\3(?=[^\{]*[;\}])/", "#\\1\\2\\3", $css);
 
     return $css;
 }
-- 
cgit v1.2.3