Merge pull request #5 from PolymerElements/paper-material

s/paper-card/paper-material/g
PolymerElements · May 1, 2015 · 64f95d9 · 64f95d9
2 parents fe4e0f3 + ed0265b
commit 64f95d9
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 26 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,28 @@
 {
   "name": "paper-button",
+  "version": "0.8.0",
+  "authors": [
+    "The Polymer Authors"
+  ],
+  "keywords": [
+    "web-components",
+    "web-component",
+    "polymer"
+  ],
+  "main": "paper-button.html",
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/PolymerElements/paper-button"
+  },
+  "license": "MIT",
+  "homepage": "https://github.com/PolymerElements/paper-button",
+  "ignore": [
+  ],
   "dependencies": {
     "polymer": "polymer/polymer#v0.8.0-rc.7",
     "paper-ripple": "polymerelements/paper-ripple#^0.8.0",
-    "paper-card": "polymerelements/paper-card#^0.8.0",
+    "paper-material": "polymerelements/paper-material#^0.8.0",
     "paper-behaviors": "polymerelements/paper-behaviors#^0.8.0"
   },
   "devDependencies": {

diff --git a/demo/index.html b/demo/index.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -15,34 +16,17 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1, user-scalable=yes">
 
-  <title>paper-button</title>
+  <title>paper-button demo</title>
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../../paper-styles/classes/typography.html">
   <link rel="import" href="../../iron-icons/iron-icons.html">
   <link rel="import" href="../paper-button.html">
 
-  <style>
-
-    body {
-      font-family: RobotoDraft, 'Helvetica Neue', Helvetica, Arial;
-      font-size: 14px;
-      padding: 24px;
-      margin: 0;
-    }
-
-    section {
-      display: block;
-      position: relative;
-      padding: 20px 0;
-    }
-
-    section > div {
-      padding: 14px;
-      font-size: 16px;
-    }
+  <link rel="stylesheet" href="../../paper-styles/demo.css">
 
+  <style>
     paper-button.colorful {
       color: #4285f4;
     }

diff --git a/index.html b/index.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
 The complete set of authors may be found at http://polymer.github.io/AUTHORS

diff --git a/paper-button.html b/paper-button.html
@@ -53,7 +53,7 @@
 -->
 
 <link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-card/paper-card.html">
+<link rel="import" href="../paper-material/paper-material.html">
 <link rel="import" href="../paper-ripple/paper-ripple.html">
 
 <link rel="import" href="../paper-behaviors/paper-button-behavior.html">
@@ -93,7 +93,7 @@
       display: none;
     }
 
-    paper-card {
+    paper-material {
       border-radius: inherit;
     }
 
@@ -110,9 +110,9 @@
 
     <paper-ripple></paper-ripple>
 
-    <paper-card class="content" elevation="[[_elevation]]" animated>
+    <paper-material class="content" elevation="[[_elevation]]" animated>
       <content></content>
-    </paper-card>
+    </paper-material>
 
   </template>
 
@@ -157,4 +157,3 @@
   </script>
 
 </dom-module>
-
diff --git a/test/index.html b/test/index.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt

diff --git a/test/paper-button.html b/test/paper-button.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt