Revert style properties change from fd57784

This broke a number of tests on an internal project.
Polymer · Jan 23, 2016 · 0a0b580 · 0a0b580
1 parent 55b91b3
commit 0a0b580
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/lib/style-properties.html b/src/lib/style-properties.html
@@ -87,7 +87,9 @@
         var parts = cssText.split(';');
         for (var i=0, p; i<parts.length; i++) {
           p = parts[i];
-          customCssText += p + ';\n';
+          if (p.match(this.rx.MIXIN_MATCH) || p.match(this.rx.VAR_MATCH)) {
+            customCssText += p + ';\n';
+          }
         }
         return customCssText;
       },

diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
@@ -273,14 +273,6 @@
       test('specificity of ::content > :not(template) selector', function() {
         assertComputed(document.querySelector('[is=x-specificity-nested]'), '10px');
       });
-
-      test('overwriting mixin properties', function() {
-        var root = document.querySelector('x-overriding');
-        assertComputed(root.querySelector('.red'), '1px');
-        assertComputed(root.querySelector('.green'), '2px');
-        assertComputed(root.querySelector('.red-2'), '1px');
-        assertComputed(root.querySelector('.blue'), '3px');
-      });
     });
 
     test('svg classes are dynamically scoped correctly', function() {