From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Sun, 1 Jan 2017 11:19:47 +0000 (+0100)
Subject: See #290 - allows `height` overriding.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=78f4aafea03fba8f2d9118859ac01482fa8a8db0;p=clean-css.git

See #290 - allows `height` overriding.

Why:

* Another step to move away from aggressive merging.
---

diff --git a/lib/properties/compactable.js b/lib/properties/compactable.js
index ca0657da..ec5549d0 100644
--- a/lib/properties/compactable.js
+++ b/lib/properties/compactable.js
@@ -125,6 +125,11 @@ var compactable = {
     shortestValue: '0',
     shorthand: true
   },
+  'height': {
+    canOverride: canOverride.unit,
+    defaultValue: 'auto',
+    shortestValue: '0'
+  },
   'list-style': {
     components: [
       'list-style-type',
diff --git a/test/optimizer/advanced-test.js b/test/optimizer/advanced-test.js
index d89a81cc..f9341311 100644
--- a/test/optimizer/advanced-test.js
+++ b/test/optimizer/advanced-test.js
@@ -88,6 +88,10 @@ vows.describe('advanced optimizer')
   )
   .addBatch(
     optimizerContext('unit compacting', {
+      'height': [
+        'div{height:1rem;height:16px}',
+        'div{height:16px}'
+      ],
       'width': [
         'div{width:1rem;width:16px}',
         'div{width:16px}'