Update packages

This commit is contained in:
Paulus Schoutsen 2016-08-08 00:38:26 -07:00
parent 1e4a049efe
commit 3a8e758a31
7 changed files with 219 additions and 218 deletions

View File

@ -15,7 +15,8 @@
"prefer-arrow-callback": 0, "prefer-arrow-callback": 0,
"no-underscore-dangle": 0, "no-underscore-dangle": 0,
"no-var": 0, "no-var": 0,
"strict": 0 "strict": 0,
"prefer-spread": 0
}, },
plugins: [ plugins: [
"html" "html"

@ -1 +1 @@
Subproject commit 5540d58870f2a090b7f6daf83ca9c74c66964d02 Subproject commit c2613c48f9f6fd7d62316b31c5e27cfb7e691a94

View File

@ -37,20 +37,20 @@
}, },
"devDependencies": { "devDependencies": {
"bower": "^1.7.9", "bower": "^1.7.9",
"eslint": "^3.1.0", "eslint": "^3.2.2",
"eslint-config-airbnb-base": "^4.0.2", "eslint-config-airbnb-base": "^5.0.1",
"eslint-plugin-html": "^1.5.1", "eslint-plugin-html": "^1.5.2",
"eslint-plugin-import": "^1.11.0", "eslint-plugin-import": "^1.12.0",
"html-minifier": "^3.0.1", "html-minifier": "^3.0.2",
"hydrolysis": "^1.24.1", "hydrolysis": "^1.24.1",
"polymer-cli": "^0.12.0", "polymer-cli": "^0.13.0",
"polymer-lint": "^0.8.1", "polymer-lint": "^0.8.1",
"rollup": "^0.34.1", "rollup": "^0.34.7",
"rollup-plugin-babel": "^2.6.1", "rollup-plugin-babel": "^2.6.1",
"rollup-plugin-buble": "^0.12.1", "rollup-plugin-buble": "^0.12.1",
"rollup-plugin-commonjs": "^3.1.0", "rollup-plugin-commonjs": "^3.3.1",
"rollup-plugin-multi-entry": "^2.0.0", "rollup-plugin-multi-entry": "^2.0.1",
"rollup-plugin-node-resolve": "^1.7.1", "rollup-plugin-node-resolve": "^2.0.0",
"rollup-plugin-replace": "^1.1.1", "rollup-plugin-replace": "^1.1.1",
"rollup-plugin-uglify": "^1.0.1", "rollup-plugin-uglify": "^1.0.1",
"rollup-watch": "^2.5.0", "rollup-watch": "^2.5.0",

View File

@ -1,75 +1,75 @@
<link rel="import" href="../../../bower_components/polymer/polymer.html"> <link rel="import" href="../../../bower_components/polymer/polymer.html">
<link rel="import" href="./state-badge.html"> <link rel="import" href="./state-badge.html">
<link rel="import" href="../ha-relative-time.html"> <link rel="import" href="../ha-relative-time.html">
<dom-module id="state-info"> <dom-module id="state-info">
<template> <template>
<style> <style>
:host { :host {
@apply(--paper-font-body1); @apply(--paper-font-body1);
min-width: 150px; min-width: 150px;
white-space: nowrap; white-space: nowrap;
} }
state-badge { state-badge {
float: left; float: left;
} }
.info { .info {
margin-left: 56px; margin-left: 56px;
} }
.name { .name {
@apply(--paper-font-common-nowrap); @apply(--paper-font-common-nowrap);
color: var(--primary-text-color); color: var(--primary-text-color);
line-height: 40px; line-height: 40px;
} }
.name[in-dialog] { .name[in-dialog] {
line-height: 20px; line-height: 20px;
} }
.time-ago { .time-ago {
@apply(--paper-font-common-nowrap); @apply(--paper-font-common-nowrap);
color: var(--secondary-text-color); color: var(--secondary-text-color);
} }
</style> </style>
<div> <div>
<state-badge state-obj='[[stateObj]]'></state-badge> <state-badge state-obj='[[stateObj]]'></state-badge>
<div class='info'> <div class='info'>
<div class='name' in-dialog$='[[inDialog]]'>[[stateObj.entityDisplay]]</div> <div class='name' in-dialog$='[[inDialog]]'>[[stateObj.entityDisplay]]</div>
<template is='dom-if' if='[[inDialog]]'> <template is='dom-if' if='[[inDialog]]'>
<div class='time-ago'> <div class='time-ago'>
<ha-relative-time datetime-obj='[[stateObj.lastChangedAsDate]]'></ha-relative-time> <ha-relative-time datetime-obj='[[stateObj.lastChangedAsDate]]'></ha-relative-time>
</div> </div>
</template> </template>
</div> </div>
</div> </div>
</template> </template>
</dom-module> </dom-module>
<script> <script>
Polymer({ Polymer({
is: 'state-info', is: 'state-info',
properties: { properties: {
detailed: { detailed: {
type: Boolean, type: Boolean,
value: false, value: false,
}, },
stateObj: { stateObj: {
type: Object, type: Object,
}, },
inDialog: { inDialog: {
type: Boolean, type: Boolean,
}, },
}, },
}); });
</script> </script>

View File

@ -1,43 +1,43 @@
<link rel="import" href="../../bower_components/polymer/polymer.html"> <link rel="import" href="../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../components/entity/state-info.html"> <link rel="import" href="../components/entity/state-info.html">
<dom-module id="state-card-display"> <dom-module id="state-card-display">
<template> <template>
<style is="custom-style" include="iron-flex iron-flex-alignment"></style> <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
<style> <style>
.state { .state {
@apply(--paper-font-body1); @apply(--paper-font-body1);
color: var(--primary-text-color); color: var(--primary-text-color);
margin-left: 16px; margin-left: 16px;
text-align: right; text-align: right;
line-height: 40px; line-height: 40px;
} }
</style> </style>
<div class='horizontal justified layout'> <div class='horizontal justified layout'>
<state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info> <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
<div class='state'>[[stateObj.stateDisplay]]</div> <div class='state'>[[stateObj.stateDisplay]]</div>
</div> </div>
</template> </template>
</dom-module> </dom-module>
<script> <script>
Polymer({ Polymer({
is: 'state-card-display', is: 'state-card-display',
properties: { properties: {
inDialog: { inDialog: {
type: Boolean, type: Boolean,
value: false, value: false,
}, },
stateObj: { stateObj: {
type: Object, type: Object,
}, },
}, },
}); });
</script> </script>

View File

@ -1,44 +1,44 @@
<link rel="import" href="../../bower_components/polymer/polymer.html"> <link rel="import" href="../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../components/entity/state-info.html"> <link rel="import" href="../components/entity/state-info.html">
<dom-module id="state-card-hvac"> <dom-module id="state-card-hvac">
<template> <template>
<style is="custom-style" include="iron-flex iron-flex-alignment"></style> <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
<style> <style>
.state { .state {
@apply(--paper-font-body1); @apply(--paper-font-body1);
color: var(--primary-text-color); color: var(--primary-text-color);
margin-left: 16px; margin-left: 16px;
text-transform: capitalize; text-transform: capitalize;
text-align: right; text-align: right;
line-height: 40px; line-height: 40px;
} }
</style> </style>
<div class='horizontal justified layout'> <div class='horizontal justified layout'>
<state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info> <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
<div class='state'>[[stateObj.state]]</div> <div class='state'>[[stateObj.state]]</div>
</div> </div>
</template> </template>
</dom-module> </dom-module>
<script> <script>
Polymer({ Polymer({
is: 'state-card-hvac', is: 'state-card-hvac',
properties: { properties: {
inDialog: { inDialog: {
type: Boolean, type: Boolean,
value: false, value: false,
}, },
stateObj: { stateObj: {
type: Object, type: Object,
}, },
}, },
}); });
</script> </script>

View File

@ -1,44 +1,44 @@
<link rel="import" href="../../bower_components/polymer/polymer.html"> <link rel="import" href="../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../components/entity/state-info.html"> <link rel="import" href="../components/entity/state-info.html">
<link rel="import" href="../components/entity/ha-entity-toggle.html"> <link rel="import" href="../components/entity/ha-entity-toggle.html">
<dom-module id="state-card-toggle"> <dom-module id="state-card-toggle">
<template> <template>
<style is="custom-style" include="iron-flex iron-flex-alignment"></style> <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
<style> <style>
ha-entity-toggle { ha-entity-toggle {
margin-left: 16px; margin-left: 16px;
} }
</style> </style>
<div class='horizontal justified layout'> <div class='horizontal justified layout'>
<state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info> <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
<ha-entity-toggle state-obj="[[stateObj]]" hass='[[hass]]'></ha-entity-toggle> <ha-entity-toggle state-obj="[[stateObj]]" hass='[[hass]]'></ha-entity-toggle>
</div> </div>
</template> </template>
</dom-module> </dom-module>
<script> <script>
Polymer({ Polymer({
is: 'state-card-toggle', is: 'state-card-toggle',
properties: { properties: {
hass: { hass: {
type: Object, type: Object,
}, },
inDialog: { inDialog: {
type: Boolean, type: Boolean,
value: false, value: false,
}, },
stateObj: { stateObj: {
type: Object, type: Object,
}, },
}, },
}); });
</script> </script>