alphasalphas

3 files changed, 42 insertions, 28 deletions

diff --git a/bower.json b/bower.json
index 8da6ac1..614fbe5 100644
--- a/bower.json
+++ b/bower.json
@@ -24,42 +24,43 @@
     "**/tests"
   ],
   "dependencies": {
-    "vaadin-combo-box": "vaadin/vaadin-combo-box#1.3.x",
-    "vaadin-context-menu": "vaadin/vaadin-context-menu#1.0.x",
-    "vaadin-date-picker": "vaadin/vaadin-date-picker#1.2.x",
-    "vaadin-grid": "vaadin/vaadin-grid#2.0.x",
-    "vaadin-icons": "vaadin/vaadin-icons#3.0.x",
-    "vaadin-split-layout": "vaadin/vaadin-split-layout#1.1.x",
-    "vaadin-upload": "vaadin/vaadin-upload#1.1.x"
+    "vaadin-button": "vaadin/vaadin-button#master",
+    "vaadin-text-field": "vaadin/vaadin-text-field#master",
+    "vaadin-form-layout": "vaadin/vaadin-form-layout#master",
+    "vaadin-combo-box": "vaadin/vaadin-combo-box#master",
+    "vaadin-split-layout": "vaadin/vaadin-split-layout#master",
+    "vaadin-context-menu": "vaadin/vaadin-context-menu#master",
+    "vaadin-date-picker": "vaadin/vaadin-date-picker#2.0-preview",
+    "vaadin-grid": "vaadin/vaadin-grid#2.1-polymer-2-rebased",
+    "vaadin-icons": "vaadin/vaadin-icons#master",
+    "vaadin-upload": "vaadin/vaadin-upload#master",
+    "paper-ripple": "PolymerElements/paper-ripple#^2.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "^4.0.3",
-    "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-    "iron-component-page": "PolymerElements/iron-component-page#~1.1.0",
-    "elements-demo-resources": "vaadin/elements-demo-resources#master",
     "mock-http-request": "philikon/MockHttpRequest#master",
-    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
-    "paper-toast": "PolymerElements/paper-toast#^1.0.0",
-    "paper-menu": "PolymerElements/paper-menu#^1.2.2",
-    "paper-item": "PolymerElements/paper-item#^1.2.1",
+    "paper-toast": "^2.0.0",
+    "paper-listbox": "^2.0.0",
+    "paper-item": "^2.0.0",
     "sugar": "^2.0.0",
-    "paper-checkbox": "PolymerElements/paper-checkbox#^1.4.2"
+    "paper-checkbox": "^2.0.0",
+    "elements-demo-resources": "^2.0.0",
+    "iron-component-page": "^2.0.0",
+    "iron-demo-helpers": "^2.0.0",
+    "iron-form": "2.0-preview",
+    "iron-test-helpers": "^2.0.0",
+    "web-component-tester": "^6.0.0",
+    "iron-list": "^2.0.0"
   },
   "resolutions": {
-    "polymer": "v1.1.1",
-    "iron-iconset-svg": "PolymerElements/iron-iconset-svg#^1.1.0"
+    "iron-flex-layout": "^2.0.0",
+    "iron-icon": "^2.0.0",
+    "iron-iconset-svg": "^2.0.0",
+    "iron-ajax": "^2.0.0",
+    "iron-meta": "1 - 2",
+    "webcomponentsjs": "^v1.0.0"
   },
   "masterOverrides": {
     "version": "master",
-    "dependencies": {
-      "vaadin-grid": "vaadin/vaadin-grid#master",
-      "vaadin-combo-box": "vaadin/vaadin-combo-box#master",
-      "vaadin-icons": "vaadin/vaadin-icons#master",
-      "vaadin-date-picker": "vaadin/vaadin-date-picker#master",
-      "vaadin-upload": "vaadin/vaadin-upload#master",
-      "vaadin-split-layout": "vaadin/vaadin-split-layout#master",
-      "vaadin-context-menu": "vaadin/vaadin-context-menu#master"
-    }
+    "dependencies": {}
   }
 }
diff --git a/index.html b/index.html
index 0109d2b..9127612 100644
--- a/index.html
+++ b/index.html
@@ -84,6 +84,15 @@ This program is available under Apache License Version 2.0, available at https:/
           <a href="../vaadin-context-menu/">Vaadin<br> ContextMenu</a>
           <a href="../vaadin-context-menu/demo/">Demo</a>
       <li>
+        <a href="../vaadin-text-field/">Vaadin<br> TextField</a>
+        <a href="../vaadin-text-field/demo/">Demo</a>
+      <li>
+        <a href="../vaadin-button/">Vaadin<br> Button</a>
+        <a href="../vaadin-button/demo/">Demo</a>
+      <li>
+        <a href="../vaadin-form-layout/">Vaadin<br> FormLayout</a>
+        <a href="../vaadin-form-layout/demo/">Demo</a>
+      <li>
         <a href="../vaadin-icons/">Vaadin<br> Icons</a>
         <a href="../vaadin-icons/demo/">Demo</a>
     </ul>
diff --git a/vaadin-core-elements.html b/vaadin-core-elements.html
index ea0e874..5e27dd4 100644
--- a/vaadin-core-elements.html
+++ b/vaadin-core-elements.html
@@ -5,3 +5,7 @@
 <link rel="import" href="../vaadin-date-picker/vaadin-date-picker.html">
 <link rel="import" href="../vaadin-split-layout/vaadin-split-layout.html">
 <link rel="import" href="../vaadin-context-menu/vaadin-context-menu.html">
+<!-- ALPHA -->
+<link rel="import" href="../vaadin-grid/vaadin-text-field.html">
+<link rel="import" href="../vaadin-grid/vaadin-button.html">
+<link rel="import" href="../vaadin-grid/vaadin-form-layout.html">