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

Commit

Permalink
Change carbon-route to app-route (#834)
Browse files Browse the repository at this point in the history
Change app-layout to PolymerElements from PolymerLabs
  • Loading branch information
chuckh authored and robdodson committed Jun 1, 2016
1 parent e438edd commit d993ece
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "polymer-starter-kit",
"dependencies": {
"app-layout": "PolymerLabs/app-layout#^0.0.15",
"carbon-route": "PolymerElements/carbon-route#^0.8.4",
"app-layout": "PolymerElements/app-layout#^0.9.0",
"app-route": "PolymerElements/app-route#^0.9.1",
"iron-elements": "PolymerElements/iron-elements#^1.0.0",
"paper-elements": "PolymerElements/paper-elements#^1.0.0",
"polymer": "Polymer/polymer#^1.0.0"
Expand Down
8 changes: 4 additions & 4 deletions src/psk-app/psk-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<link rel="import" href="../../bower_components/polymer/polymer.html">

<link rel="import" href="../../bower_components/carbon-route/carbon-location.html">
<link rel="import" href="../../bower_components/carbon-route/carbon-route.html">
<link rel="import" href="../../bower_components/app-route/app-location.html">
<link rel="import" href="../../bower_components/app-route/app-route.html">

<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
Expand Down Expand Up @@ -99,8 +99,8 @@
</style>

<!-- setup routes -->
<carbon-location route="{{route}}"></carbon-location>
<carbon-route route="{{route}}" pattern="/:page" data="{{pageData}}"></carbon-route>
<app-location route="{{route}}"></app-location>
<app-route route="{{route}}" pattern="/:page" data="{{pageData}}"></app-route>

<app-scrollpos-control selected="{{pageData.page}}"></app-scrollpos-control>

Expand Down

0 comments on commit d993ece

Please sign in to comment.