Skip to content
This repository has been archived by the owner on Mar 13, 2018. It is now read-only.

Commit

Permalink
Merge pull request #19 from Polymer/master
Browse files Browse the repository at this point in the history
8/1 master -> stable
  • Loading branch information
dfreedm committed Aug 1, 2013
2 parents ce6d7c9 + 9bc38e8 commit f1a52fd
Show file tree
Hide file tree
Showing 78 changed files with 929 additions and 1,564 deletions.
Binary file removed AceEditor/images/menu.png
Binary file not shown.
64 changes: 0 additions & 64 deletions AceEditor/index.html

This file was deleted.

File renamed without changes
File renamed without changes
40 changes: 20 additions & 20 deletions Gallery/metadata.html
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
<ga-meta id="x-coolclock" label="Cool Clock" author="Scott J. Miles" publishedDate="May 21 2013"
<ga-meta id="cool-clock" label="Cool Clock" author="Scott J. Miles" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/x-coolclock.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/CoolClock"
demoUrl="../../more-elements/CoolClock/">
imageUrl="images/cool-clock.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/master/cool-clock"
demoUrl="../../more-elements/cool-clock/">
</ga-meta>

<ga-meta id="yt-search-video" label="Youtube Search Video" author="Steve Orvell & Frankie Fu" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/yt-search-video.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/Youtube"
demoUrl="../../more-elements/Youtube/">
sourceUrl="https://github.com/Polymer/more-elements/tree/master/Youtube/yt-search-video"
demoUrl="../../more-elements/Youtube/yt-search-video/">
</ga-meta>

<ga-meta id="wu-weather" label="Underground Weather" author="Yvonne Yip" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/wu-weather.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/Weather"
demoUrl="../../more-elements/Weather/">
sourceUrl="https://github.com/Polymer/more-elements/tree/master/wu-weather"
demoUrl="../../more-elements/wu-weather/">
</ga-meta>

<ga-meta id="x-stock" label="Stock" author="Frankie Fu" publishedDate="May 21 2013"
<ga-meta id="polymer-stock" label="Stock" author="Frankie Fu" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/x-stock.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/Stock"
demoUrl="../../more-elements/Stock/">
imageUrl="images/polymer-stock.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/master/polymer-stock"
demoUrl="../../more-elements/polymer-stock/">
</ga-meta>

<ga-meta id="pdf-js" label="PDF Reader" author="Scott J. Miles" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/pdf-js.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/pdf.js"
demoUrl="../../more-elements/pdf.js/example/">
sourceUrl="https://github.com/Polymer/more-elements/tree/master/pdf.-js"
demoUrl="../../more-elements/pdf-js/">
</ga-meta>

<ga-meta id="chart-js" label="Chart.js" author="Scott J. Miles" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/chart-js.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/Chart.js"
demoUrl="../../more-elements/Chart.js/">
sourceUrl="https://github.com/Polymer/more-elements/tree/master/chart-js"
demoUrl="../../more-elements/chart-js/">
</ga-meta>

<ga-meta id="smoothie-chart" label="Smoothie Chart" author="Scott J. Miles" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/smoothie-chart.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/smoothie-charts"
demoUrl="../../more-elements/smoothie-charts/">
sourceUrl="https://github.com/Polymer/more-elements/tree/master/smoothie-chart"
demoUrl="../../more-elements/smoothie-chart/">
</ga-meta>

<ga-meta id="marked-js" label="Markdown Renderer" author="Scott J. Miles" publishedDate="May 21 2013"
description="<p>Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec rutrum dui sed purus ultrices in tempus metus convallis.</p><p>Sed ultrices porttitor lectus, eget pretium ipsum dictum pellentesque. Donec tempus fringilla enim in aliquam. Nulla urna diam, semper eu elementum vitae, iaculis in leo. Proin tincidunt dolor ligula. Phasellus suscipit, nisi eget auctor ultrices, erat velit egestas elit, sit amet aliquet nisi dui in turpis. Phasellus quis libero diam, sed facilisis lorem. Praesent porttitor tempor eros ut ultricies. Donec commodo posuere nisi, vitae ullamcorper ante vulputate nec. Mauris malesuada semper iaculis. Duis elementum dolor vel tellus commodo malesuada. Vivamus mauris nibh, pharetra et pellentesque pharetra, vestibulum nec libero. Nulla consectetur eros at mi faucibus et euismod eros tincidunt. Aenean tortor nibh, dictum ut gravida sed, venenatis non lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
imageUrl="images/marked-js.png"
sourceUrl="https://github.com/Polymer/more-elements/tree/stable/marked"
demoUrl="../../more-elements/marked/">
sourceUrl="https://github.com/Polymer/more-elements/tree/master/marked-js"
demoUrl="../../more-elements/marked-js/">
</ga-meta>

<ga-meta id="x-tags" label="X-Tags" author="Mozilla" publishedDate="May 21 2013"
Expand Down
4 changes: 4 additions & 0 deletions Playground/elements.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
<link rel="import" href="../../polymer-elements/polymer-flex-layout/polymer-flex-layout.html">
<link rel="import" href="../../polymer-elements/polymer-collapse/polymer-collapse.html">
<link rel="import" href="../../polymer-elements/polymer-meta/polymer-meta.html">
<link rel="import" href="../../polymer-elements/polymer-grid-layout/polymer-grid-layout.html">

<!-- polymer-ui-elements -->
<link rel="import" href="../../polymer-ui-elements/polymer-ui-icon/polymer-ui-icon.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-icon-button/polymer-ui-icon-button.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-toolbar/polymer-ui-toolbar.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-menu/polymer-ui-menu.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-menu-item/polymer-ui-menu-item.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-submenu-item/polymer-ui-submenu-item.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-nav-arrow/polymer-ui-nav-arrow.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-sidebar/polymer-ui-sidebar.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-sidebar-menu/polymer-ui-sidebar-menu.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-ratings/polymer-ui-ratings.html">
<link rel="import" href="../../polymer-ui-elements/polymer-ui-toggle-button/polymer-ui-toggle-button.html">
Expand Down
42 changes: 42 additions & 0 deletions Playground/index-embed.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!DOCTYPE html>
<!--
Copyright 2013 The Polymer Authors. All rights reserved.
Use of this source code is governed by a BSD-style
license that can be found in the LICENSE file.
-->
<html>
<head>
<title>Polymer Playground Embed</title>
<script src="../../polymer/polymer.js"></script>
<link rel="import" href="elements.html">
<link rel="import" href="metadata.html">
<link rel="import" href="src/pg-view.html">
<link rel="stylesheet" href="../../polymer-ui-elements/basic.css">
<style>
pg-view {
height: 360px;
margin-bottom: 20px;
border: 5px solid #4683ea;
border-radius: 3px;
}
</style>
</head>
<body class="polymer-ui-body-text" theme="polymer-ui-light-theme">
<polymer-meta id=meta></polymer-meta>
<pg-view id="polymer-grid-layout"></pg-view>
<pg-view id="polymer-ui-icon-button"></pg-view>
<pg-view id="polymer-ui-ratings"></pg-view>
<pg-view id="polymer-ui-toggle-button"></pg-view>
<pg-view id="polymer-ui-toolbar"></pg-view>
<pg-view id="polymer-ui-menu"></pg-view>

<script>
document.addEventListener('WebComponentsReady', function() {
var meta = document.querySelector('#meta');
document.querySelectorAll('pg-view').forEach(function(view) {
view.meta = meta.byId(view.id);
});
});
</script>
</body>
</html>
6 changes: 5 additions & 1 deletion Playground/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
<!-- import elements -->
<link rel="import" href="elements.html">
<link rel="import" href="src/pg-app.html">
<!-- load metadata -->
<!-- load sample metadata -->
<link rel="import" href="metadata.html">
<!-- load element metadata -->
<link rel="import" href="polymer-elements-metadata.html">
<link rel="import" href="polymer-ui-elements-metadata.html">
<link rel="import" href="more-elements-metadata.html">
<!-- -->
<link rel="stylesheet" href="../../polymer-ui-elements/basic.css">
</head>
Expand Down
Loading

0 comments on commit f1a52fd

Please sign in to comment.