Skip to content

Commit

Permalink
Merge pull request Polymer#681 from robdodson/master
Browse files Browse the repository at this point in the history
Update plunker-button to latest version
  • Loading branch information
ebidel committed Oct 3, 2014
2 parents 1cc47de + a96d64f commit 2195161
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"x-tag-imports": "x-tag/x-tag-imports",
"marked": "*",
"highlightjs": "*",
"plunker-button": "robdodson/plunker-button",
"topeka": "Polymer/topeka"
}
}
6 changes: 3 additions & 3 deletions elements/common_elements.vulcanized.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion elements/demo-tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</template>
</core-selector>
<template if="{{demoSrc}}">
<plunker-button src="{{demoSrc}}"></plunker-button>
<plunker-button src="{{demoSrc}}">Edit on Plunker</plunker-button>
</template>
</div>
<div id="wrapper" class="{{ {bottom: bottom} | tokenList}}">
Expand Down
2 changes: 1 addition & 1 deletion elements/homepage_elements.vulcanized.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ rm -rf polymer-all/projects/
mv projects/ polymer-all/
cp -R js/bower_components/highlightjs/ components/highlightjs
cp -R js/bower_components/marked/ components/marked
cp -R js/bower_components/plunker-button/ components/plunker-button
cp -R js/bower_components/native-promise-only/ components/native-promise-only

# Update topeka =====
cd js/bower_components/topeka
Expand Down
7 changes: 7 additions & 0 deletions scripts/website.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
"component-download-button"
]
},
{
"dir": "components",
"org": "robdodson",
"repos": [
"plunker-button"
]
},
{
"dir": "projects",
"org": "Polymer",
Expand Down

0 comments on commit 2195161

Please sign in to comment.