e3b2d07 · hakyll · git.iko.soy

Added proper handling of windows newlines during whitespace compression of CSS files. Simpified several regexps.

commite3b2d07756e749a4910b434226a70fc1ad5a0e63 authorIvan N. Veselov <veselov@gmail.com> dateThu 2 Aug 2012, 16:13 (14 years ago) parentbc8821f

1 file changed+2−2

unifiedsplit

src/Hakyll/Web/CompressCss.hs+2−2

@@ -31,12 +31,12 @@ compressCss = compressSeparators

3131compressSeparators :: String -> String

3232compressSeparators = replaceAll "; *}" (const "}")

3333 . replaceAll " *([{};:]) *" (take 1 . dropWhile isSpace)

34− . replaceAll ";;*" (const ";")

34+ . replaceAll ";+" (const ";")

3535

3636-- | Compresses all whitespace.

3737--

3838compressWhitespace :: String -> String

39−compressWhitespace = replaceAll "[ \t\n][ \t\n]*" (const " ")

39+compressWhitespace = replaceAll "[ \t\n\r]+" (const " ")

4040

4141-- | Function that strips CSS comments away.

4242--