Merge branch 'master' into p3-preview

# Conflicts: # bower.json # package.json
vaadin · Apr 24, 2018 · 792a7fb · 792a7fb
2 parents f7241d2 + a26e763
commit 792a7fb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11,002 deletions.
diff --git a/bower.json b/bower.json
@@ -32,7 +32,8 @@
   "devDependencies": {
     "iron-component-page": "^3.0.0",
     "iron-meta": "^2.0.0",
-    "vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#p3-preview"
+    "vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#p3-preview",
+    "vaadin-text-field": "vaadin/vaadin-text-field#p3-preview"
   },
   "variants": {
     "1.x": {

diff --git a/demo/index.html b/demo/index.html
@@ -10,6 +10,7 @@
   <link rel="import" href="../../vaadin-demo-helpers/vaadin-component-demo.html">
   <link rel="import" href="../../vaadin-demo-helpers/vaadin-component-demo.html">
   <link rel="import" href="../../vaadin-demo-helpers/vaadin-demo-snippet.html">
+  <link rel="import" href="../../vaadin-text-field/vaadin-text-field.html">
   <script src="../../vaadin-demo-helpers/vaadin-demo-ready-event-emitter.js"></script>
 
   <script src="./icons-demo.js"></script>