Merge pull request #13 from pkaske/polymer-1.0

Polymer 1.0
ebidel · Jun 11, 2015 · 18ecf1d · 18ecf1d
2 parents 143a9b5 + d36a7eb
commit 18ecf1d
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 bower_components
-node_modules
+node_modules
+.idea
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n-msg",
-  "version": "0.0.5",
+  "version": "1.0.1",
   "authors": [
     "Eric Bidelman <ebidel@>"
   ],
@@ -22,13 +22,10 @@
     "/tests/"
   ],
   "dependencies": {
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0",
-    "polymer": "Polymer/polymer#^0.5.5"
+    "polymer": "Polymer/polymer#^1.0.0",
+    "observe-js": "Polymer/observe-js"
   },
   "devDependencies": {
     "web-component-tester": "Polymer/web-component-tester#master"
-  },
-  "resolutions": {
-    "webcomponentsjs": "^0.6.0"
   }
 }
diff --git a/demo.html b/demo.html
@@ -9,7 +9,7 @@
   <link rel="import" href="i18n-msg.html">
 
 </head>
-<body unresolved>
+<body>
 
 <p>"Days" in selected language is: <b><i18n-msg id="daysMsgEl" msgid="days">PLACEHOLDER_STRING</i18n-msg></b>!</p>
 <p>"Hours" in selected language is: <b><i18n-msg msgid="hours">PLACEHOLDER_STRING</i18n-msg></b>!</p>