Merge pull request #14 from PolymerElements/fix-dragons

stop bringing in the paper-styles kitchen sink
PolymerElements · Nov 18, 2015 · bf6fd22 · bf6fd22
2 parents 864c450 + 010c332
commit bf6fd22
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -27,7 +27,7 @@
     "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
     "test-fixture": "polymerelements/test-fixture#^1.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
-    "web-component-tester": "*",
+    "web-component-tester": "polymer/web-component-tester#^3.4.0",
     "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0"
   },
   "ignore": []

diff --git a/demo/x-key-aware.html b/demo/x-key-aware.html
@@ -9,7 +9,7 @@
 -->
 
 <link rel="import" href="../../polymer/polymer.html">
-<link rel="import" href="../../paper-styles/paper-styles.html">
+<link rel="import" href="../../paper-styles/color.html">
 <link rel="import" href="../iron-a11y-keys.html">
 
 <dom-module id="x-key-aware">
@@ -22,7 +22,7 @@
     pre {
       color: var(--google-blue-700);
     }
-    
+
     .keys {
       line-height: 25px;
     }

diff --git a/test/basic-test.html b/test/basic-test.html
@@ -16,11 +16,8 @@
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
-  <script src="../../test-fixture/test-fixture-mocha.js"></script>
-
 
   <link rel="import" href="../../iron-test-helpers/iron-test-helpers.html">
-  <link rel="import" href="../../test-fixture/test-fixture.html">
   <link rel="import" href="../iron-a11y-keys.html">
 </head>
 <body>