Fix parsing of minimized css output also for mixins

Polymer · Dec 30, 2015 · 87d02e0 · 87d02e0
1 parent 94f505a
commit 87d02e0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/lib/css-parse.html b/src/lib/css-parse.html
@@ -171,14 +171,14 @@
     _rx: {
       comments: /\/\*[^*]*\*+([^/*][^*]*\*+)*\//gim,
       port: /@import[^;]*;/gim,
-      customProp: /(?:^[^;\-\s}]+)?--[^;{]*?:[^{};]*?(?:[;\n]|$)/gim,
-      mixinProp: /(?:^|[\s;])?--[^;{]*?:[^{;]*?{[^}]*?}(?:[;\n]|$)?/gim,
+      customProp: /(?:^[^;\-\s}]+)?--[^;{}]*?:[^{};]*?(?:[;\n]|$)/gim,
+      mixinProp:  /(?:^[^;\-\s}]+)?--[^;{}]*?:[^{};]*?{[^}]*?}(?:[;\n]|$)?/gim,
       mixinApply: /@apply[\s]*\([^)]*?\)[\s]*(?:[;\n]|$)?/gim,
-      varApply: /[^;:]*?:[^;]*?var\([^;]*\)(?:[;\n]|$)?/gim,
+      varApply: /[^;:]*?:[^;]*?var\([^;]*\)(?:[;\n]|$)?/gim,
       keyframesRule: /^@[^\s]*keyframes/,
       multipleSpaces: /\s+/g
-    },
-
+    },
+
     VAR_START: '--',
     MEDIA_START: '@media',
     AT_START: '@'