update polymer

Polymer · Aug 10, 2016 · 392c3fc · 392c3fc
1 parent 0166005
commit 392c3fc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/polymer-styling.js b/lib/polymer-styling.js
@@ -388,7 +388,10 @@ Polymer.StyleUtil = (function() {
           e = e$[i];
           // look inside templates for elements
           if (e.localName === 'template') {
-            cssText += this.cssFromElement(e);
+            // retain css content when specified,
+            if (!e.hasAttribute('preserve-content')) {
+              cssText += this.cssFromElement(e);
+            }
           } else {
             // style elements inside dom-modules will apply to the main document
             // we don't want this, so we remove them here.
@@ -1006,10 +1009,10 @@ Polymer.ApplyShim = (function(){
   }
 
   // fix shim'd var syntax
-  // var(--a, --b) -> var(--a, var(--b));
+  // var(--a, --b) -> var(--a,var(--b))
   function fixVars(matchText, varA, varB) {
     // if fallback doesn't exist, or isn't a broken variable, abort
-    return 'var(' + varA + ',' + 'var(' + varB + '));';
+    return 'var(' + varA + ',' + 'var(' + varB + '))';
   }
 
   // produce variable consumption at the site of mixin consumption