Skip to content

Commit 8cf6228

Browse files
GranzeGranze
authored
Merge pull request #14 from Granze/v2.0
V2.0
2 parents 1cc1fbf + d378831 commit 8cf6228

File tree

8 files changed

+240
-360
lines changed

8 files changed

+240
-360
lines changed

‎.travis.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
language: node_js
2-
node_js:
3-
- '4.0.0'
4-
- '5.0.0'
2+
node_js: stable
3+
dist: trusty
4+
sudo: required
55
addons:
66
firefox: latest
7-
before_install:
8-
- 'npm install -g bower web-component-tester'
9-
- 'bower install'
10-
- 'export DISPLAY=:99.0'
11-
- 'sh -e /etc/init.d/xvfb start'
12-
script: 'wct'
7+
apt:
8+
sources:
9+
- google-chrome
10+
packages:
11+
- google-chrome-stable
12+
before_script:
13+
- npm install -g bower polylint web-component-tester
14+
- bower install
15+
- polylint
16+
script: xvfb-run wct

‎bower.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
{
22
"name": "flip-clock",
3-
"version": "1.2.5",
3+
"version": "2.0.0",
44
"keywords": [
55
"polymer",
66
"web-components"
77
],
88
"main": "flip-clock.html",
99
"dependencies": {
10-
"moment": "~2.13.0",
11-
"polymer": "Polymer/polymer#^1.4.0"
10+
"polymer": "Polymer/polymer#^2.0.0",
11+
"moment": "^2.18.1"
1212
},
1313
"devDependencies": {
14-
"test-fixture": "polymerelements/test-fixture#^1.1.0",
15-
"iron-test-helpers": "polymerelements/iron-test-helpers#~1.2.3",
16-
"iron-component-page": "polymerelements/iron-component-page#~1.1.2"
14+
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
15+
"web-component-tester": "Polymer/web-component-tester#^6.0.0",
16+
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
17+
},
18+
"resolutions": {
19+
"polymer": "^2.0.0"
1720
},
1821
"homepage": "https://github.com/Granze/flip-clock",
1922
"authors": [

‎demo/index.html‎

Lines changed: 42 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,53 @@
11
<!doctype html>
2-
<html>
2+
<html lang="en">
33
<head>
4-
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
5-
<title>flip-clock Demo</title>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
6+
7+
<title>flip-clock demo</title>
8+
69
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
10+
11+
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
12+
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
713
<link rel="import" href="../flip-clock.html">
14+
15+
<custom-style>
16+
<style is="custom-style" include="demo-pages-shared-styles">
17+
</style>
18+
</custom-style>
819
<style>
9-
body {
10-
margin: 0;
11-
padding: 0;
12-
color: #333;
13-
background: #fff;
14-
}
15-
a {
16-
color: #fff;
17-
}
18-
a:hover {
19-
text-decoration: none;
20-
}
21-
h1 {
22-
margin: 0 auto;
23-
font-weight: normal;
24-
}
25-
h1 span {
26-
font-size: 14px;
27-
}
28-
h2 {
29-
font-size: 34px;
30-
margin: 30px 0 10px;
31-
}
32-
.wrapper {
33-
max-width: 960px;
34-
margin: 20px auto 0 auto;
35-
text-align: center;
36-
}
37-
code {
38-
display: inline-block;
39-
margin: 0 0 20px 0;
40-
font-family: monospace , serif;
41-
border: 1px solid #ddd;
42-
background-color: #f8f8f8;
43-
border-radius: 3px;
44-
padding: 2px 4px;
45-
color: #333;
20+
.centered {
21+
max-width: 620px;
4622
}
4723
</style>
4824
</head>
4925
<body>
50-
<div class="wrapper">
51-
<h2>Clock</h2>
52-
<code>&lt;flip-clock&gt;&lt;/flip-clock&gt;</code>
53-
<flip-clock></flip-clock>
54-
55-
<h2>Timer </h2>
56-
<code>&lt;flip-clock display-mode=&quot;timer&quot; show-buttons&gt;&lt;/flip-clock&gt;</code>
57-
<flip-clock display-mode="timer" show-buttons></flip-clock>
58-
59-
<h2>Countdown </h2>
60-
<code>&lt;flip-clock display-mode=&quot;countdown&quot; start-from=&quot;20&quot; show-buttons&gt;&lt;/flip-clock&gt;</code>
61-
<flip-clock display-mode="countdown" start-from="20" show-buttons></flip-clock>
62-
63-
<h2>Countdown without hours</h2>
64-
<code>&lt;flip-clock display-mode=&quot;countdown&quot; start-from=&quot;20&quot; show-buttons hide-hours&gt;&lt;/flip-clock&gt;</code>
65-
<flip-clock display-mode="countdown" start-from="20" show-buttons hide-hours></flip-clock>
66-
</div>
26+
<div class="vertical-section-container centered">
27+
<h3>Basic flip-clock</h3>
28+
<demo-snippet>
29+
<template>
30+
<flip-clock></flip-clock>
31+
</template>
32+
</demo-snippet>
33+
<h3>Timer flip-clock</h3>
34+
<demo-snippet>
35+
<template>
36+
<flip-clock display-mode="timer" show-buttons></flip-clock>
37+
</template>
38+
</demo-snippet>
39+
<h3>Countdown flip-clock</h3>
40+
<demo-snippet>
41+
<template>
42+
<flip-clock display-mode="countdown" start-from="20" show-buttons></flip-clock>
43+
</template>
44+
</demo-snippet>
45+
<h3>Countdown without hours flip-clock</h3>
46+
<demo-snippet>
47+
<template>
48+
<flip-clock display-mode="countdown" start-from="20" show-buttons hide-hours></flip-clock>
49+
</template>
50+
</demo-snippet>
51+
</div>
6752
</body>
6853
</html>

0 commit comments

Comments
 (0)