Merge pull request #43 from PolymerElements/fix-dragons

stop bringing in the paper-styles kitchen sink
PolymerElements · Nov 18, 2015 · 1db7676 · 1db7676
2 parents dab73d4 + 706aa0b
commit 1db7676
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -22,6 +22,7 @@
   "ignore": [],
   "dependencies": {
     "iron-input": "PolymerElements/iron-input#^1.0.0",
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
     "iron-form-element-behavior": "PolymerElements/iron-form-element-behavior#^1.0.0",
     "paper-input": "PolymerElements/paper-input#^1.0.0",
     "paper-styles": "PolymerElements/paper-styles#^1.0.0",
@@ -31,7 +32,7 @@
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "web-component-tester": "*",
+    "web-component-tester": "polymer/web-component-tester#^3.4.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   }
 }
diff --git a/demo/index.html b/demo/index.html
@@ -19,8 +19,6 @@
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <link rel="import" href="../gold-phone-input.html">
-
-  <link rel="stylesheet" href="../../paper-styles/paper-styles.html">
   <link rel="import" href="../../paper-styles/demo-pages.html">
 </head>
 <body unresolved>

diff --git a/gold-phone-input.html b/gold-phone-input.html
@@ -11,9 +11,10 @@
 <link rel="import" href="../paper-input/paper-input-behavior.html">
 <link rel="import" href="../paper-input/paper-input-container.html">
 <link rel="import" href="../paper-input/paper-input-error.html">
+<link rel="import" href="../paper-styles/typography.html">
 <link rel="import" href="../iron-input/iron-input.html">
 <link rel="import" href="../iron-form-element-behavior/iron-form-element-behavior.html">
-<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
 
 <!--
 `<gold-phone-input>` is a single-line text field with Material Design styling
@@ -75,13 +76,21 @@
     @apply(--gold-phone-input-country-code);
   }
 
+  .container {
+    @apply(--layout-horizontal);
+  }
+
   /* TODO(notwaldorf): The style applied by paper-input-container is more
    * specific, and we need the important to override it. This will go away
    * once we can refactor this element to use the paper-input suffix */
   label {
     left: 40px !important;
   }
 
+  input {
+    @apply(--layout-flex);
+  }
+
   </style>
 
   <template>
@@ -93,10 +102,10 @@
 
       <label hidden$="[[!label]]">[[label]]</label>
 
-      <div class="horizontal layout">
+      <div class="container">
          <span class="country-code">+[[countryCode]]</span>
 
-        <input is="iron-input" id="input" class="flex"
+        <input is="iron-input" id="input"
           aria-labelledby$="[[_ariaLabelledBy]]"
           aria-describedby$="[[_ariaDescribedBy]]"
           required$="[[required]]"

diff --git a/test/basic.html b/test/basic.html
@@ -20,12 +20,10 @@
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <script src="../../web-component-tester/browser.js"></script>
-  <script src="../../test-fixture/test-fixture-mocha.js"></script>
 
   <script src="../../iron-test-helpers/test-helpers.js"></script>
   <script src="../../iron-test-helpers/mock-interactions.js"></script>
 
-  <link rel="import" href="../../test-fixture/test-fixture.html">
   <link rel="import" href="../gold-phone-input.html">
 
 </head>