From: Jakub Pawlowicz Date: Thu, 23 Apr 2015 20:41:25 +0000 (+0100) Subject: Fixes #544 - regression in same value merging. X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=7ecbbb2ef66c06b45f205645c076947724458d52;p=clean-css.git Fixes #544 - regression in same value merging. --- diff --git a/History.md b/History.md index f584bc09..2742310a 100644 --- a/History.md +++ b/History.md @@ -9,6 +9,11 @@ * Moves URL rebasing & rewriting into lib/urls. * Fixed issue [#436](https://github.com/jakubpawlowicz/clean-css/issues/436) - refactors URI rewriting. +[3.2.4 / 2015-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.3...3.2) +================== + +* Fixed issue [#544](https://github.com/jakubpawlowicz/clean-css/issues/544) - regression in same value merging. + [3.2.3 / 2015-04-22](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.2...v3.2.3) ================== diff --git a/lib/properties/optimizer.js b/lib/properties/optimizer.js index 55cb3878..d632214f 100644 --- a/lib/properties/optimizer.js +++ b/lib/properties/optimizer.js @@ -113,7 +113,7 @@ function _optimize(properties, mergeAdjacent, aggressiveMerging, validator) { if (property.unused) continue; - if (_name == lastName && sameValue(position)) { + if (position > 0 && _name == lastName && sameValue(position)) { property.unused = true; continue; } diff --git a/test/fixtures/issue-544-min.css b/test/fixtures/issue-544-min.css new file mode 100644 index 00000000..a5cdd955 --- /dev/null +++ b/test/fixtures/issue-544-min.css @@ -0,0 +1 @@ +.btn-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%)} \ No newline at end of file diff --git a/test/fixtures/issue-544.css b/test/fixtures/issue-544.css new file mode 100644 index 00000000..96372f09 --- /dev/null +++ b/test/fixtures/issue-544.css @@ -0,0 +1,8 @@ +.btn-danger { + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c)); + background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%); +} + +.btn-danger { + background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%); +}