From: Jakub Pawlowicz Date: Sun, 15 Jan 2017 11:11:38 +0000 (+0100) Subject: See #290 - disables `transition` shorthand overriding. X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=50a02787fa48cefd9ed02cdf25456304b788ee0f;p=clean-css.git See #290 - disables `transition` shorthand overriding. Why: * It's a shorthand property, so not straightforward to implement in shorthand/override compacting; * pending in #861. --- diff --git a/lib/optimizer/level-2/compacting/optimize.js b/lib/optimizer/level-2/compacting/optimize.js index 5b60cfdb..e3a38363 100644 --- a/lib/optimizer/level-2/compacting/optimize.js +++ b/lib/optimizer/level-2/compacting/optimize.js @@ -37,23 +37,7 @@ var shorthands = { 'font-size': ['font'], 'font-style': ['font'], 'font-variant': ['font'], - 'font-weight': ['font'], - 'transition-delay': ['transition'], - 'transition-duration': ['transition'], - 'transition-property': ['transition'], - 'transition-timing-function': ['transition'], - '-moz-transition-delay': ['-moz-transition'], - '-moz-transition-duration': ['-moz-transition'], - '-moz-transition-property': ['-moz-transition'], - '-moz-transition-timing-function': ['-moz-transition'], - '-o-transition-delay': ['-o-transition'], - '-o-transition-duration': ['-o-transition'], - '-o-transition-property': ['-o-transition'], - '-o-transition-timing-function': ['-o-transition'], - '-webkit-transition-delay': ['-webkit-transition'], - '-webkit-transition-duration': ['-webkit-transition'], - '-webkit-transition-property': ['-webkit-transition'], - '-webkit-transition-timing-function': ['-webkit-transition'] + 'font-weight': ['font'] }; function _optimize(properties, mergeAdjacent, aggressiveMerging, validator) { diff --git a/test/optimizer/level-2/compacting/longhand-overriding-test.js b/test/optimizer/level-2/compacting/longhand-overriding-test.js index b57d05fa..495ce2fa 100644 --- a/test/optimizer/level-2/compacting/longhand-overriding-test.js +++ b/test/optimizer/level-2/compacting/longhand-overriding-test.js @@ -143,11 +143,7 @@ vows.describe(optimize) 'padding-bottom': ['padding'], 'padding-left': ['padding'], 'padding-right': ['padding'], - 'padding-top': ['padding'], - 'transition-delay': ['transition'], - 'transition-duration': ['transition'], - 'transition-property': ['transition'], - 'transition-timing-function': ['transition'] + 'padding-top': ['padding'] }) ) .export(module);