Merge pull request #29 from PolymerLabs/layout

Update to iron-flex-layout
googlearchive · May 5, 2015 · 751ec45 · 751ec45
2 parents eb67bcc + 1eb2e2f
commit 751ec45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -27,8 +27,11 @@
   "devDependencies": {
     "iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.5",
     "iron-selector": "PolymerElements/iron-selector#^0.8.2",
-    "paper-styles": "PolymerElements/paper-styles#^0.8.3",
-    "paper-styles": "PolymerElements/paper-styles#^0.8.6",
+    "paper-styles": "PolymerElements/paper-styles#^0.8.9",
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^0.8.1",
     "web-component-tester": "*"
+  },
+  "resolutions": {
+    "observe-js": "0.5.6-rc1"
   }
 }
diff --git a/demo/polyfora-forum.html b/demo/polyfora-forum.html
@@ -7,7 +7,7 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <link rel="import" href="../../polymer/polymer.html">
-<link rel="import" href="../../paper-styles/layout.html">
+<link rel="import" href="../../iron-flex-layout/classes/iron-flex-layout.html">
 <link rel="import" href="../../paper-styles/shadow.html">
 <link rel="import" href="../../paper-styles/typography.html">
 

diff --git a/demo/polyfora-thread.html b/demo/polyfora-thread.html
@@ -7,7 +7,7 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <link rel="import" href="../../polymer/polymer.html">
-<link rel="import" href="../../paper-styles/layout.html">
+<link rel="import" href="../../iron-flex-layout/classes/iron-flex-layout.html">
 <link rel="import" href="../../paper-styles/shadow.html">
 <link rel="import" href="../../paper-styles/typography.html">