From e3b2d07756e749a4910b434226a70fc1ad5a0e63 Mon Sep 17 00:00:00 2001
From: "Ivan N. Veselov" <veselov@gmail.com>
Date: Thu, 2 Aug 2012 16:13:07 +0300
Subject: Added proper handling of windows newlines during whitespace
 compression of CSS files. Simpified several regexps.

---
 src/Hakyll/Web/CompressCss.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Hakyll/Web/CompressCss.hs b/src/Hakyll/Web/CompressCss.hs
index 090fe10..52b5396 100644
--- a/src/Hakyll/Web/CompressCss.hs
+++ b/src/Hakyll/Web/CompressCss.hs
@@ -31,12 +31,12 @@ compressCss = compressSeparators
 compressSeparators :: String -> String
 compressSeparators = replaceAll "; *}" (const "}")
                    . replaceAll " *([{};:]) *" (take 1 . dropWhile isSpace)
-                   . replaceAll ";;*" (const ";")
+                   . replaceAll ";+" (const ";")
 
 -- | Compresses all whitespace.
 --
 compressWhitespace :: String -> String
-compressWhitespace = replaceAll "[ \t\n][ \t\n]*" (const " ")
+compressWhitespace = replaceAll "[ \t\n\r]+" (const " ")
 
 -- | Function that strips CSS comments away.
 --
-- 
cgit v1.2.3