Skip to content
This repository was archived by the owner on Jan 4, 2021. It is now read-only.

Commit 94b86e2

Browse files
ystreibelystreibel
committed
[DEV] Pass to polymer 1.0.0
1 parent f19e4df commit 94b86e2

9 files changed

Lines changed: 289 additions & 262 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bower_components

‎bower.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"test"
2424
],
2525
"dependencies": {
26-
"polymer": "Polymer/polymer#~0.5.x",
27-
"paper-dialog": "Polymer/paper-dialog#~0.5.x",
28-
"paper-progress": "Polymer/paper-progress#~0.5.x",
26+
"polymer": "Polymer/polymer#^1.0.0",
27+
"paper-dialog": "polymerelements/paper-dialog#^1.0.0",
28+
"paper-progress": "polymerelements/paper-progress#^1.0.0",
2929
"myscript-toolbar": "1.0.0",
3030
"myscript-result": "1.0.0",
3131
"myscript-ink-manager": "1.0.0",
@@ -34,6 +34,7 @@
3434
"myscript-canvas": "1.0.0"
3535
},
3636
"devDependencies": {
37-
"web-component-tester": "Polymer/web-component-tester#^0.7.x"
37+
"iron-component-page": "polymerelements/iron-component-page#^1.0.0",
38+
"web-component-tester": "*"
3839
}
3940
}

‎demo.html‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎demo/index.html‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=no">
5+
<title>myscript-math Demo</title>
6+
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
7+
<link rel="import" href="../myscript-math.html">
8+
9+
</head>
10+
<body>
11+
12+
<!--<myscript-math application-Key="0b2c0e80-beb3-42a6-9580-5732f5e8f80f" hmac-Key="18e72adc-4160-4738-9c9b-fe7b012b928f"></myscript-math>-->
13+
<myscript-math url="localhost:8888" application-Key="b79f1ea7-fde2-477a-8495-7c0fb0c45465" hmac-Key="d6f00d23-7dbc-41dc-9935-47aee3cf1c56"></myscript-math>
14+
15+
</body>
16+
</html>

‎index.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<!doctype html>
22
<html>
33
<head>
4-
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
5-
<script src="../webcomponentsjs/webcomponents.js"></script>
6-
<link rel="import" href="../polymer/polymer.html">
7-
<link rel="import" href="../core-component-page/core-component-page.html">
4+
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
8+
<script src="../webcomponentsjs/webcomponents-lite.js"></script>
9+
<link rel="import" href="../iron-component-page/iron-component-page.html">
810

911
</head>
10-
<body unresolved>
12+
<body>
1113

12-
<core-component-page></core-component-page>
14+
<iron-component-page></iron-component-page>
1315

1416
</body>
1517
</html>

‎metadata.html‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎myscript-math.css‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
:host {
2-
display: inherit;
3-
height: 100%;
4-
}
5-
61
paper-progress {
72
display: block;
83
width: 100%;

0 commit comments

Comments
 (0)