Skip to content
This repository has been archived by the owner on Dec 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #4 from PolymerElements/hamster
Browse files Browse the repository at this point in the history
polymer++
  • Loading branch information
notwaldorf committed May 6, 2015
2 parents 783e5ea + 85671fd commit 2c11f03
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
14 changes: 7 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iron-collapse",
"version": "0.8.0",
"version": "0.9.0",
"authors": [
"The Polymer Authors"
],
Expand All @@ -20,13 +20,13 @@
"ignore": [
],
"dependencies": {
"polymer": "Polymer/polymer#v0.8.0-rc.7"
"polymer": "Polymer/polymer#v0.9.0-rc.1"
},
"devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#~0.6.1",
"web-component-tester": "Polymer/web-component-tester#^2.2.3",
"test-fixture": "PolymerElements/test-fixture#^0.8.0",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0",
"paper-styles": "PolymerElements/paper-styles#^0.8.0"
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0",
"web-component-tester": "*",
"test-fixture": "PolymerElements/test-fixture#^0.9.0",
"iron-component-page": "PolymerElements/iron-component-page#^0.9.0",
"paper-styles": "PolymerElements/paper-styles#^0.9.0"
}
}
10 changes: 2 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,12 @@
<script src="../webcomponentsjs/webcomponents-lite.js"></script>

<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-doc-viewer/iron-doc-viewer.html">

<style>
body {
margin: 16px;
}
</style>
<link rel="import" href="../iron-component-page/iron-component-page.html">

</head>
<body>

<iron-doc-viewer src="iron-collapse.html"></iron-doc-viewer>
<iron-component-page></iron-component-page>

</body>
</html>

0 comments on commit 2c11f03

Please sign in to comment.