From: Anton Byrna <anton.byrna@gmail.com>
Date: Thu, 26 Jun 2014 10:34:12 +0000 (+0400)
Subject: Preserve viewport units
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=f3b96ac61669e547f144cbcdb52a9890934a100b;p=clean-css.git

Preserve viewport units
---

diff --git a/lib/properties/validator.js b/lib/properties/validator.js
index 67b9398d..acfed8b9 100644
--- a/lib/properties/validator.js
+++ b/lib/properties/validator.js
@@ -3,7 +3,7 @@
 
 module.exports = (function () {
   // Regexes used for stuff
-  var cssUnitRegexStr = '(\\-?\\.?\\d+\\.?\\d*(px|%|em|rem|in|cm|mm|ex|pt|pc|)|auto|inherit)';
+  var cssUnitRegexStr = '(\\-?\\.?\\d+\\.?\\d*(px|%|em|rem|in|cm|mm|ex|pt|pc|vw|vh|vmin|vmax|)|auto|inherit)';
   var cssFunctionNoVendorRegexStr = '[A-Z]+(\\-|[A-Z]|[0-9])+\\(([A-Z]|[0-9]|\\ |\\,|\\#|\\+|\\-|\\%|\\.)*\\)';
   var cssFunctionVendorRegexStr = '\\-(\\-|[A-Z]|[0-9])+\\(([A-Z]|[0-9]|\\ |\\,|\\#|\\+|\\-|\\%|\\.)*\\)';
   var cssFunctionAnyRegexStr = '(' + cssFunctionNoVendorRegexStr + '|' + cssFunctionVendorRegexStr + ')';
diff --git a/test/unit-test.js b/test/unit-test.js
index 3e1b9092..2c31664d 100644
--- a/test/unit-test.js
+++ b/test/unit-test.js
@@ -1952,5 +1952,8 @@ title']{display:block}",
       'a{outline:5px auto -webkit-focus-ring-color}',
       'a{outline:-webkit-focus-ring-color auto 5px}'
     ]
+  }),
+  'viewport units': cssContext({
+    'shorthand margin with viewport width not changed': 'div{margin:5vw}'
   })
 }).export(module);