Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for content appearing behind header in hassio and config panels #1708

Merged
merged 2 commits into from
Sep 26, 2018
Merged

Fix for content appearing behind header in hassio and config panels #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e27e116
Call iron-resize on route change
cgarwood Sep 26, 2018
82ec4ae
Add EventsMixin to hassio-main
cgarwood Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hassio/src/hassio-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import './hassio-data.js';
import './hassio-pages-with-tabs.js';

import applyThemesOnElement from '../../src/common/dom/apply_themes_on_element.js';
import EventsMixin from '../../src/mixins/events-mixin.js';
import NavigateMixin from '../../src/mixins/navigate-mixin.js';

class HassioMain extends NavigateMixin(PolymerElement) {
class HassioMain extends EventsMixin(NavigateMixin(PolymerElement)) {
static get template() {
return html`
<app-route route="[[route]]" pattern="/:page" data="{{routeData}}"></app-route>
Expand Down Expand Up @@ -93,6 +94,7 @@ class HassioMain extends NavigateMixin(PolymerElement) {
if (route.path === '' && route.prefix === '/hassio') {
this.navigate('/hassio/dashboard', true);
}
this.fire('iron-resize');
}

equalsAddon(page) {
Expand Down
5 changes: 4 additions & 1 deletion src/panels/config/ha-panel-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import '../../layouts/hass-error-screen.js';

import isComponentLoaded from '../../common/config/is_component_loaded.js';
import EventsMixin from '../../mixins/events-mixin.js';
import NavigateMixin from '../../mixins/navigate-mixin.js';

import(/* webpackChunkName: "panel-config-automation" */ './automation/ha-config-automation.js');
Expand All @@ -19,9 +20,10 @@ import(/* webpackChunkName: "panel-config-users" */ './users/ha-config-users.js'
import(/* webpackChunkName: "panel-config-zwave" */ './zwave/ha-config-zwave.js');

/*
* @appliesMixin EventsMixin
* @appliesMixin NavigateMixin
*/
class HaPanelConfig extends NavigateMixin(PolymerElement) {
class HaPanelConfig extends EventsMixin(NavigateMixin(PolymerElement)) {
static get template() {
return html`
<app-route
Expand Down Expand Up @@ -170,6 +172,7 @@ class HaPanelConfig extends NavigateMixin(PolymerElement) {
if (route.path === '' && route.prefix === '/config') {
this.navigate('/config/dashboard', true);
}
this.fire('iron-resize');
}

_equals(a, b) {
Expand Down