Merge pull request #7 from Polymer/master

8/1 master -> stable
googlearchive · Aug 1, 2013 · ca40352 · ca40352
2 parents c625aa8 + cbc15f9
commit ca40352
Show file tree

Hide file tree

Showing 53 changed files with 2,479 additions and 311 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/docs
+
+/node_modules
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tools"]
+	path = tools
+	url = https://github.com/Polymer/tools.git
diff --git a/assets/action-icons.pdn b/assets/action-icons.pdn
diff --git a/assets/action-icons.png b/assets/action-icons.png
diff --git a/gruntfile.js b/gruntfile.js
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+module.exports = function(grunt) {
+  grunt.initConfig({
+    yuidoc: {
+      compile: {
+        name: '<%= pkg.name %>',
+        description: '<%= pkg.description %>',
+        version: '<%= pkg.version %>',
+        url: '<%= pkg.homepage %>',
+        options: {
+          exclude: 'third_party',
+          extension: '.js,.html',
+          paths: '.',
+          outdir: 'docs',
+          linkNatives: 'true',
+          tabtospace: 2,
+          themedir: 'tools/doc/themes/footstrap'
+        }
+      }
+    },
+    pkg: grunt.file.readJSON('package.json')
+  });
+
+  // plugins
+  grunt.loadNpmTasks('grunt-contrib-yuidoc');
+
+  // tasks
+  grunt.registerTask('default', ['yuidoc']);
+  grunt.registerTask('docs', ['yuidoc']);
+};
+
diff --git a/manifest.xml b/manifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<meta>
+  <polymer-element-meta name="polymer-ui-accordion"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-collapsible"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-field"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-icon"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-icon-button"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-menu"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-menu-item"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-nav-arrow"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-ratings"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-sidebar-menu"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-splitter"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-tabs"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-theme-aware"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-toggle-button"></polymer-element-meta>
+  <polymer-element-meta name="polymer-ui-toolbar"></polymer-element-meta>
+</meta>
diff --git a/package.json b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "PolymerUIElements",
+  "version": "0.0.1",
+  "devDependencies": {
+    "grunt": "*",
+    "grunt-contrib-yuidoc": "*"
+  }
+}
diff --git a/polymer-ui-accordion/polymer-ui-accordion.html b/polymer-ui-accordion/polymer-ui-accordion.html
@@ -41,4 +41,7 @@
     <link rel="stylesheet" href="polymer-ui-accordion.css">
     <shadow></shadow>
   </template>
+  <script>
+    Polymer('polymer-ui-accordion');
+  </script>
 </polymer-element>
diff --git a/polymer-ui-collapsible/polymer-ui-collapsible.html b/polymer-ui-collapsible/polymer-ui-collapsible.html
@@ -27,21 +27,30 @@
 -->
 <link rel="import" href="../../polymer-elements/polymer-collapse/polymer-collapse.html">
 
-<polymer-element name="polymer-ui-collapsible" attributes="active">
+<polymer-element name="polymer-ui-collapsible" attributes="active notap">
   <template>
     <link rel="stylesheet" href="polymer-ui-collapsible.css">
-    <div on-tap="toggle">
+    <div on-tap="headerTap">
       <content select=".polymer-ui-collapsible-header"></content>
     </div>
-    <div id="collapsibleBody">
+    <div id="collapsibleBody" on-tap="bodyTap">
       <content></content>
     </div>
     <polymer-collapse targetId="collapsibleBody" closed="{{!active}}"></polymer-collapse>
   </template>
   <script>
     Polymer('polymer-ui-collapsible', {
+      notap: false,
       toggle: function() {
         this.active = !this.active;
+      },
+      headerTap: function() {
+        if (!this.notap) {
+          this.toggle();
+        }
+      },
+      bodyTap: function(e) {
+        e.cancelBubble = true;
       }
     });
   </script>

diff --git a/polymer-ui-field/index.html b/polymer-ui-field/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>Polymer UI Field</title>
+    <script src="../../polymer/polymer.js" debug></script>
+    <link rel="import" href="polymer-ui-field.html" />
+    <link rel="import" href="../polymer-ui-icon-button/polymer-ui-icon-button.html" />
+    <style>
+      html {
+        font-family: 'Helvetica Neue', 'Roboto', 'Arial', sans-serif;
+        font-size: 14px;
+      }
+    </style>
+  </head>
+  <body>
+    <polymer-ui-field>
+      <polymer-ui-icon-button icon="add"></polymer-ui-icon-button>
+      <input value="Field input">
+    </polymer-ui-field>
+  </body>
+</html>
diff --git a/polymer-ui-field/polymer-ui-field.html b/polymer-ui-field/polymer-ui-field.html
@@ -0,0 +1,33 @@
+<polymer-element name="polymer-ui-field">
+  <template>
+    <style>
+      @host {
+        * {
+          display: block;
+          padding: 18px;
+          border-bottom: 1px solid rgba(0, 0, 0, 0.15);
+        }
+      }
+      ::-webkit-distributed(input) {
+          font-size: 14px;
+          height: 40px;
+          color: #333;
+          border: 0;
+          flex: 1 auto;
+      }
+      ::-webkit-distributed(input::placeholder) {
+        color: #b3b3b3;
+      }
+      div {
+        display: flex;
+        flex-direction: row;
+      }
+    </style>
+    <div>
+      <content select="*"></content>
+    </div>
+  </template>
+  <script>
+    Polymer('polymer-ui-field');
+  </script>
+</polymer-element>
diff --git a/polymer-ui-icon-button/polymer-ui-icon-button.css b/polymer-ui-icon-button/polymer-ui-icon-button.css
@@ -16,15 +16,15 @@ license that can be found in the LICENSE file.
     background: url(btn_light.png) top left no-repeat;
     background-size: cover;
   }
-        
+
   *:hover {
     background-position: 0 -44px;
   }
-        
+
   *.selected {
     background-position: 0 -88px;
   }
-        
+
   *:active, *.selected:active {
     background-position: 0 -132px;
   }

diff --git a/polymer-ui-icon-button/polymer-ui-icon-button.html b/polymer-ui-icon-button/polymer-ui-icon-button.html
@@ -30,7 +30,7 @@
 <polymer-element name="polymer-ui-icon-button" attributes="src index icon active">
   <template>
     <link rel="stylesheet" href="polymer-ui-icon-button.css">
-    <polymer-ui-icon src="{{src}}" index="{{index}}" icon="{{icon}}"></polymer-ui-icon>
+    <polymer-ui-icon src="{{src}}" index="{{index}}" icon="{{icon}}"><content></content></polymer-ui-icon>
   </template>
   <script>
     Polymer('polymer-ui-icon-button', {

diff --git a/polymer-ui-icon/action-icons.png b/polymer-ui-icon/action-icons.png