From 8c5beb0042d86a3ba4018517341e4404be24b33b Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 10 Sep 2019 20:17:11 +0200 Subject: [PATCH] Replace paper-fab with ha-fab (#3678) * Replace paper-fab with ha-fab ...which is based on mwc-fab * comment --- package.json | 1 - .../area_registry/ha-config-area-registry.ts | 14 +++++++------- .../config/automation/ha-automation-editor.ts | 16 ++++++++-------- .../config/automation/ha-automation-picker.ts | 14 +++++++------- .../integrations/ha-config-entries-dashboard.js | 14 +++++++------- src/panels/config/person/ha-config-person.ts | 10 +++++----- src/panels/config/script/ha-script-editor.js | 16 ++++++++-------- src/panels/config/script/ha-script-picker.ts | 14 +++++++------- src/panels/config/users/ha-config-user-picker.js | 14 +++++++------- src/panels/lovelace/hui-view-editable.ts | 2 +- src/panels/lovelace/hui-view.ts | 10 ++++------ yarn.lock | 11 ----------- 12 files changed, 61 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index 5497150d25..4c4c03e79e 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "@polymer/paper-dialog-scrollable": "^3.0.1", "@polymer/paper-drawer-panel": "^3.0.1", "@polymer/paper-dropdown-menu": "^3.0.1", - "@polymer/paper-fab": "^3.0.1", "@polymer/paper-icon-button": "^3.0.2", "@polymer/paper-input": "^3.0.1", "@polymer/paper-item": "^3.0.1", diff --git a/src/panels/config/area_registry/ha-config-area-registry.ts b/src/panels/config/area_registry/ha-config-area-registry.ts index 840655482c..cf37726d81 100644 --- a/src/panels/config/area_registry/ha-config-area-registry.ts +++ b/src/panels/config/area_registry/ha-config-area-registry.ts @@ -8,7 +8,6 @@ import { } from "lit-element"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; -import "@polymer/paper-fab/paper-fab"; import { HomeAssistant } from "../../../types"; import { @@ -19,6 +18,7 @@ import { subscribeAreaRegistry, } from "../../../data/area_registry"; import "../../../components/ha-card"; +import "../../../components/ha-fab"; import "../../../layouts/hass-subpage"; import "../../../layouts/hass-loading-screen"; import "../ha-config-section"; @@ -100,7 +100,7 @@ class HaConfigAreaRegistry extends LitElement { - + > `; } @@ -183,24 +183,24 @@ All devices in this area will become unassigned.`) padding-top: 4px; padding-bottom: 4px; } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; z-index: 1; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } - paper-fab.rtl { + ha-fab.rtl { right: auto; left: 16px; } - paper-fab[is-wide].rtl { + ha-fab[is-wide].rtl { bottom: 24px; right: auto; left: 24px; diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index be52d70603..92e34d43cb 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -10,11 +10,11 @@ import { import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-toolbar/app-toolbar"; import "@polymer/paper-icon-button/paper-icon-button"; -import "@polymer/paper-fab/paper-fab"; import { classMap } from "lit-html/directives/class-map"; import { h, render } from "preact"; +import "../../../components/ha-fab"; import "../../../components/ha-paper-icon-button-arrow-prev"; import "../../../layouts/ha-app-layout"; @@ -113,7 +113,7 @@ class HaAutomationEditor extends LitElement { })}" > - + > `; } @@ -301,7 +301,7 @@ class HaAutomationEditor extends LitElement { span[slot="introduction"] a { color: var(--primary-color); } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; @@ -310,21 +310,21 @@ class HaAutomationEditor extends LitElement { transition: margin-bottom 0.3s; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } - paper-fab[dirty] { + ha-fab[dirty] { margin-bottom: 0; } - paper-fab.rtl { + ha-fab.rtl { right: auto; left: 16px; } - paper-fab[is-wide].rtl { + ha-fab[is-wide].rtl { bottom: 24px; right: auto; left: 24px; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index d8c6259bfb..262e1e6c97 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -8,13 +8,13 @@ import { customElement, } from "lit-element"; import { ifDefined } from "lit-html/directives/if-defined"; -import "@polymer/paper-fab/paper-fab"; import "@polymer/paper-icon-button/paper-icon-button"; import "@polymer/paper-item/paper-item-body"; import "@polymer/paper-tooltip/paper-tooltip"; import "../../../layouts/hass-subpage"; import "../../../components/ha-card"; +import "../../../components/ha-fab"; import "../../../components/entity/ha-entity-toggle"; import "../ha-config-section"; @@ -136,7 +136,7 @@ class HaAutomationPicker extends LitElement { - `; @@ -186,24 +186,24 @@ class HaAutomationPicker extends LitElement { display: flex; } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; z-index: 1; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } - paper-fab[rtl] { + ha-fab[rtl] { right: auto; left: 16px; } - paper-fab[rtl][is-wide] { + ha-fab[rtl][is-wide] { bottom: 24px; right: auto; left: 24px; diff --git a/src/panels/config/integrations/ha-config-entries-dashboard.js b/src/panels/config/integrations/ha-config-entries-dashboard.js index 0a2159a45a..48e4ff6022 100644 --- a/src/panels/config/integrations/ha-config-entries-dashboard.js +++ b/src/panels/config/integrations/ha-config-entries-dashboard.js @@ -1,7 +1,6 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes"; import "@polymer/paper-tooltip/paper-tooltip"; import "@material/mwc-button"; -import "@polymer/paper-fab/paper-fab"; import "@polymer/iron-icon/iron-icon"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; @@ -9,6 +8,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../../components/ha-card"; +import "../../../components/ha-fab"; import "../../../components/entity/ha-state-icon"; import "../../../layouts/hass-subpage"; import "../../../resources/ha-style"; @@ -53,24 +53,24 @@ class HaConfigManagerDashboard extends LocalizeMixin( color: var(--primary-text-color); text-decoration: none; } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; z-index: 1; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } - paper-fab[rtl] { + ha-fab[rtl] { right: auto; left: 16px; } - paper-fab[rtl][is-wide] { + ha-fab[rtl][is-wide] { bottom: 24px; right: auto; left: 24px; @@ -141,13 +141,13 @@ class HaConfigManagerDashboard extends LocalizeMixin( - + > `; } diff --git a/src/panels/config/person/ha-config-person.ts b/src/panels/config/person/ha-config-person.ts index b4c34cce11..94fe6c427c 100644 --- a/src/panels/config/person/ha-config-person.ts +++ b/src/panels/config/person/ha-config-person.ts @@ -8,7 +8,6 @@ import { } from "lit-element"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; -import "@polymer/paper-fab/paper-fab"; import { HomeAssistant } from "../../../types"; import { @@ -19,6 +18,7 @@ import { createPerson, } from "../../../data/person"; import "../../../components/ha-card"; +import "../../../components/ha-fab"; import "../../../layouts/hass-subpage"; import "../../../layouts/hass-loading-screen"; import { compare } from "../../../common/string/compare"; @@ -109,12 +109,12 @@ class HaConfigPerson extends LitElement { - + > `; } @@ -221,14 +221,14 @@ All devices belonging to this person will become unassigned.`) ha-card.storage paper-item { cursor: pointer; } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; z-index: 1; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } diff --git a/src/panels/config/script/ha-script-editor.js b/src/panels/config/script/ha-script-editor.js index 5b550094f7..98bafc668e 100644 --- a/src/panels/config/script/ha-script-editor.js +++ b/src/panels/config/script/ha-script-editor.js @@ -1,13 +1,13 @@ import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-toolbar/app-toolbar"; import "@polymer/paper-icon-button/paper-icon-button"; -import "@polymer/paper-fab/paper-fab"; import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; import { h, render } from "preact"; import "../../../layouts/ha-app-layout"; import "../../../components/ha-paper-icon-button-arrow-prev"; +import "../../../components/ha-fab"; import Script from "../js/script"; import unmountPreact from "../../../common/preact/unmount"; @@ -65,7 +65,7 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) { span[slot="introduction"] a { color: var(--primary-color); } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; @@ -74,21 +74,21 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) { transition: margin-bottom 0.3s; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } - paper-fab[dirty] { + ha-fab[dirty] { margin-bottom: 0; } - paper-fab[rtl] { + ha-fab[rtl] { right: auto; left: 16px; } - paper-fab[rtl][is-wide] { + ha-fab[rtl][is-wide] { bottom: 24px; right: auto; left: 24px; @@ -115,7 +115,7 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
- + > `; } diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index bdba5f7621..be4b30a862 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -7,7 +7,6 @@ import { property, customElement, } from "lit-element"; -import "@polymer/paper-fab/paper-fab"; import "@polymer/paper-icon-button/paper-icon-button"; import "@polymer/paper-item/paper-item-body"; import { HassEntity } from "home-assistant-js-websocket"; @@ -17,6 +16,7 @@ import "../../../layouts/hass-subpage"; import { computeRTL } from "../../../common/util/compute_rtl"; import "../../../components/ha-card"; +import "../../../components/ha-fab"; import "../ha-config-section"; @@ -81,13 +81,13 @@ class HaScriptPicker extends LitElement { - + > `; @@ -135,24 +135,24 @@ class HaScriptPicker extends LitElement { display: flex; } - paper-fab { + ha-fab { position: fixed; bottom: 16px; right: 16px; z-index: 1; } - paper-fab[is-wide] { + ha-fab[is-wide] { bottom: 24px; right: 24px; } - paper-fab[rtl] { + ha-fab[rtl] { right: auto; left: 16px; } - paper-fab[rtl][is-wide] { + ha-fab[rtl][is-wide] { bottom: 24px; right: auto; left: 24px; diff --git a/src/panels/config/users/ha-config-user-picker.js b/src/panels/config/users/ha-config-user-picker.js index ffaaa47327..8610e6b5b9 100644 --- a/src/panels/config/users/ha-config-user-picker.js +++ b/src/panels/config/users/ha-config-user-picker.js @@ -1,4 +1,3 @@ -import "@polymer/paper-fab/paper-fab"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; import { html } from "@polymer/polymer/lib/utils/html-tag"; @@ -7,6 +6,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../../layouts/hass-subpage"; import "../../../components/ha-icon-next"; import "../../../components/ha-card"; +import "../../../components/ha-fab"; import LocalizeMixin from "../../../mixins/localize-mixin"; import NavigateMixin from "../../../mixins/navigate-mixin"; @@ -27,21 +27,21 @@ class HaUserPicker extends EventsMixin( static get template() { return html`