Merge pull request #11 from JKillian/jk/cssUnits

Add vmin and vmax CSS units
8 years ago · 0224ec8e0e
parent ab254ceffc 57054a860f
commit 0224ec8e0e
3 changed files with 3 additions and 3 deletions
--- a/src/css.ts
+++ b/src/css.ts
@ -145,7 +145,7 @@ export var language = <IMonarchLanguage> {
        ],

        units: [
-            ['(em|ex|ch|rem|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)?', 'constant.numeric', '@pop']
+            ['(em|ex|ch|rem|vmin|vmax|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)?', 'constant.numeric', '@pop']
        ],

        keyframedeclaration: [
--- a/src/less.ts
+++ b/src/less.ts
@ -144,7 +144,7 @@ export var language = <ILanguage> {
 		],

 		units: [
-			['((em|ex|ch|rem|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)\\b)?', TOKEN_VALUE + '.unit', '@pop']
+			['((em|ex|ch|rem|vmin|vmax|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)\\b)?', TOKEN_VALUE + '.unit', '@pop']
 		],

 		strings: [
--- a/src/scss.ts
+++ b/src/scss.ts
@ -184,7 +184,7 @@ export var language = <IMonarchLanguage> {
        ],

        units: [
-            ['(em|ex|ch|rem|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)?', 'constant.numeric', '@pop']
+            ['(em|ex|ch|rem|vmin|vmax|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)?', 'constant.numeric', '@pop']
        ],

        functiondeclaration: [