From: Jakub Pawlowicz Date: Sun, 14 Jun 2015 09:59:02 +0000 (+0100) Subject: Fixes #601 - minifying percentages inside `flex`. X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=b95450b056ba25c689b8a92b3868e6111bba5765;p=clean-css.git Fixes #601 - minifying percentages inside `flex`. Apparently IE10-11 do not like it. --- diff --git a/History.md b/History.md index d6544c2f..0b9ef14f 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,8 @@ +[3.3.2 / 2015-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/v3.3.1...3.3) +================== + +* Fixed issue [#601](https://github.com/jakubpawlowicz/clean-css/issues/601) - percentage minifying inside `flex`. + [3.3.1 / 2015-06-02](https://github.com/jakubpawlowicz/clean-css/compare/v3.3.0...v3.3.1) ================== diff --git a/lib/selectors/optimizers/simple.js b/lib/selectors/optimizers/simple.js index 9ad66a15..6feb33fe 100644 --- a/lib/selectors/optimizers/simple.js +++ b/lib/selectors/optimizers/simple.js @@ -107,10 +107,13 @@ function precisionMinifier(_, value, precisionOptions) { .replace(/(\d)\.($|\D)/g, '$1$2'); } -function unitMinifier(_, value, unitsRegexp) { +function unitMinifier(name, value, unitsRegexp) { if (/^(?:\-moz\-calc|\-webkit\-calc|calc)\(/.test(value)) return value; + if (name == 'flex' || name == 'flex-basis') + return value; + return value .replace(unitsRegexp, '$1' + '0' + '$2') .replace(unitsRegexp, '$1' + '0' + '$2'); diff --git a/test/selectors/optimizers/simple-test.js b/test/selectors/optimizers/simple-test.js index 76bfdc77..17c478de 100644 --- a/test/selectors/optimizers/simple-test.js +++ b/test/selectors/optimizers/simple-test.js @@ -505,6 +505,14 @@ vows.describe(SimpleOptimizer) 'inside calc': [ 'a{font-size:calc(100% + 0px)}', [['font-size', 'calc(100% + 0px)']] + ], + 'flex': [ + 'a{flex: 1 0 0%}', + [['flex', '1', '0', '0%']] + ], + 'flex–basis': [ + 'a{flex-basis:0%}', + [['flex-basis', '0%']] ] }) )