Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

s/paper-card/paper-material/g #5

Merged
merged 1 commit into from
May 1, 2015
Merged

s/paper-card/paper-material/g #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
24 changes: 4 additions & 20 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions paper-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -93,7 +93,7 @@
display: none;
}

paper-card {
paper-material {
border-radius: inherit;
}

Expand All @@ -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>

Expand Down Expand Up @@ -157,4 +157,3 @@
</script>

</dom-module>

1 change: 1 addition & 0 deletions test/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions test/paper-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down