Merge branch 'develop'

tejitak · Jun 3, 2015 · baa338c · baa338c
2 parents 260dfba + 57ebc68
commit baa338c
Show file tree

Hide file tree

Showing 23 changed files with 2,647 additions and 257 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "left-swipe-action",
- "version": "0.1.3",
+ "version": "0.2.0",
  "authors": [
  "tejitak"
  ],
@@ -12,7 +12,7 @@
  "license": "MIT",
  "homepage": "https://github.com/tejitak/left-swipe-action",
  "dependencies": {
- "polymer": "~0.5.2"
+ "polymer": "~1.0.2"
  },
  "ignore": [
  "**/.*"

diff --git a/demo.html b/demo.html
@@ -3,14 +3,14 @@
 <head>
  <title>Polymer Web Component "left-swipe-action" Demo</title>
  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
- <script src="bower_components/webcomponentsjs/webcomponents.js"></script>
+ <script src="bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
+ <link rel="stylesheet" href="//fonts.googleapis.com/css?family=RobotoDraft:300,400,500|Source+Code+Pro:400,500,700">
  <link rel="import" href="demo/bower_components/polymer/polymer.html">
- <link rel="import" href="demo/bower_components/font-roboto/roboto.html">
- <link rel="import" href="demo/bower_components/core-icons/core-icons.html">
- <link rel="import" href="demo/bower_components/core-icons/social-icons.html">
  <link rel="import" href="demo/bower_components/paper-icon-button/paper-icon-button.html">
- <link rel="import" href="demo/bower_components/paper-fab/paper-fab.html">
  <link rel="import" href="demo/bower_components/paper-button/paper-button.html">
+ <link rel="import" href="demo/bower_components/paper-fab/paper-fab.html">
+ <link rel="import" href="demo/bower_components/iron-icons/iron-icons.html" >
+ <link rel="import" href="demo/bower_components/iron-icons/social-icons.html" >
  <link rel="import" href="left-swipe-action.html">
  <style>
  html, body {
@@ -144,7 +144,7 @@
  <left-swipe-action-button>
  <a href="https://github.com/tejitak/left-swipe-action" target="_blank">
  <paper-button raised class="custom">
- <core-icon icon="social:post-github"></core-icon>
+ <iron-icon icon="archive"></iron-icon>
  View on Github
  </paper-button>
  </a>
@@ -205,7 +205,7 @@ <h3>Icon action</h3>
  <div>
  <left-swipe-action shadow>
  <div>
- <core-icon icon="arrow-back" style="margin: 30px;"></core-icon>
+ <iron-icon icon="arrow-back" style="margin: 30px;"></iron-icon>
  </div>
  <left-swipe-action-button onclick="alert('favorite')"><paper-fab icon="favorite"></paper-fab></left-swipe-action-button>
  </left-swipe-action>
@@ -214,7 +214,7 @@ <h3>Flat (no shadow attribute)</h3>
  <div>
  <left-swipe-action>
  <div>
- <core-icon icon="arrow-back" style="margin: 30px;"></core-icon>
+ <iron-icon icon="arrow-back" style="margin: 30px;"></iron-icon>
  </div>
  <left-swipe-action-button onclick="alert('favorite')"><paper-fab icon="favorite"></paper-fab></left-swipe-action-button>
  </left-swipe-action>
@@ -266,7 +266,7 @@ <h3>Within container</h3>
  <div style="color: #abafb8; font-size: 12px">more info</div>
  </div>
  <left-swipe-action-button onclick="alert('cloud-download')">
- <core-icon icon="cloud-download"></core-icon>
+ <iron-icon icon="cloud-download"></iron-icon>
  </left-swipe-action-button>
  </left-swipe-action>
  </div>
@@ -305,8 +305,8 @@ <h3>Offset for opened states (add an attribute offset="280")</h3>
  <div id="list_example">
  <div class="separator"></div>
  <h2>List example</h2>
- <template is="auto-binding">
- <template repeat="{{[1,2,3,4,5]}}">
+ <template is="dom-bind">
+ <template is="dom-repeat" items="[1,2,3,4,5]">
  <left-swipe-action shadow offset="40">
  <div class="list-container">
  <div class="list-thumb"><a href="https://twitter.com/tejitak" target="_blank"><paper-icon-button icon="social:person"></paper-icon-button></a></div>

diff --git a/demo/bower.json b/demo/bower.json
@@ -7,6 +7,9 @@
  ],
  "license": "MIT",
  "dependencies": {
- "paper-elements": "Polymer/paper-elements#~0.5.2"
+ "paper-button": "PolymerElements/paper-button#^1.0.1",
+ "paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
+ "paper-fab": "PolymerElements/paper-fab#^1.0.1",
+ "iron-icons": "PolymerElements/iron-icons#^1.0.1"
  }
 }
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 <head>
  <title>Polymer example: left-swipe-action</title>
  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
- <script src="bower_components/webcomponentsjs/webcomponents.js"></script>
+ <script src="bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
  <link rel="import" href="bower_components/polymer/polymer.html">
  <link rel="import" href="left-swipe-action.html">
  <style>

diff --git a/left-swipe-action-button.html b/left-swipe-action-button.html
@@ -10,27 +10,27 @@
 @element left-swipe-action-button
 @auther tejitak
 -->
-<polymer-element name="left-swipe-action-button">
- <template>
- <style>
- :host {
- display: table;
- height: 100%;
- padding: 0 20px;
- }
+<dom-module id="left-swipe-action-button">
+ <style>
+ :host {
+ display: table;
+ height: 100%;
+ padding: 0 20px;
+ }
 
- .action-button-wrapper {
- display: table-cell;
- vertical-align: middle;
- font-size: 1.8rem;
- font-weight: 300;
- }
- </style>
+ .action-button-wrapper {
+ display: table-cell;
+ vertical-align: middle;
+ font-size: 1.8rem;
+ font-weight: 300;
+ }
+ </style>
+ <template>
  <div class="action-button-wrapper">
  <content></content>
  </div>
  </template>
- <script>
- Polymer({});
- </script>
-</polymer-element>
+</dom-module>
+<script>
+ Polymer({is: "left-swipe-action-button"});
+</script>