From 0a0b580981bcd7ba6af33161993355bed99056cd Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@google.com>
Date: Fri, 22 Jan 2016 19:17:53 -0800
Subject: [PATCH] Revert style properties change from
 fd5778470551f677c2aa5827398681abb1994a88

This broke a number of tests on an internal project.
---
 src/lib/style-properties.html | 4 +++-
 test/unit/styling-scoped.html | 8 --------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/lib/style-properties.html b/src/lib/style-properties.html
index 0fa6c6b793..dec71dde24 100644
--- 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
index df39a933a7..8a86a00516 100644
--- 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() {