Skip to content

Don't add space on the bottom when not showing tabs #6913

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

Merged
ludeeus merged 1 commit into from
Sep 10, 2020
Merged

Don't add space on the bottom when not showing tabs #6913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 deletions src/layouts/hass-tabs-subpage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ import {
css,
CSSResult,
customElement,
eventOptions,
html,
internalProperty,
LitElement,
property,
internalProperty,
PropertyValues,
TemplateResult,
eventOptions,
} from "lit-element";
import { classMap } from "lit-html/directives/class-map";
import memoizeOne from "memoize-one";
import { isComponentLoaded } from "../common/config/is_component_loaded";
import { restoreScroll } from "../common/decorators/restore-scroll";
import { navigate } from "../common/navigate";
import "../components/ha-menu-button";
import { computeRTL } from "../common/util/compute_rtl";
import "../components/ha-icon";
import "../components/ha-icon-button-arrow-prev";
import { HomeAssistant, Route } from "../types";
import "../components/ha-menu-button";
import "../components/ha-svg-icon";
import "../components/ha-icon";
import "../components/ha-tab";
import { restoreScroll } from "../common/decorators/restore-scroll";
import { computeRTL } from "../common/util/compute_rtl";
import { HomeAssistant, Route } from "../types";

export interface PageNavigation {
path: string;
Expand Down Expand Up @@ -132,7 +132,7 @@ class HassTabsSubpage extends LitElement {
this.hass.language,
this.narrow
);

const showTabs = tabs.length > 1 || !this.narrow;
return html`
<div class="toolbar">
${this.mainPage
Expand All @@ -152,7 +152,7 @@ class HassTabsSubpage extends LitElement {
${this.narrow
? html` <div class="main-title"><slot name="header"></slot></div> `
: ""}
${tabs.length > 1 || !this.narrow
${showTabs
? html`
<div id="tabbar" class=${classMap({ "bottom-bar": this.narrow })}>
${tabs}
Expand All @@ -163,10 +163,15 @@ class HassTabsSubpage extends LitElement {
<slot name="toolbar-icon"></slot>
</div>
</div>
<div class="content" @scroll=${this._saveScrollPos}>
<div
class="content ${classMap({ tabs: showTabs })}"
@scroll=${this._saveScrollPos}
>
<slot></slot>
</div>
<div id="fab"><slot name="fab"></slot></div>
<div id="fab" class="${classMap({ tabs: showTabs })}">
<slot name="fab"></slot>
</div>
`;
}

Expand Down Expand Up @@ -274,12 +279,13 @@ class HassTabsSubpage extends LitElement {
margin-left: env(safe-area-inset-left);
margin-right: env(safe-area-inset-right);
height: calc(100% - 65px);
height: calc(100% - 65px - env(safe-area-inset-bottom));
overflow-y: auto;
overflow: auto;
-webkit-overflow-scrolling: touch;
}

:host([narrow]) .content {
:host([narrow]) .content.tabs {
height: calc(100% - 128px);
height: calc(100% - 128px - env(safe-area-inset-bottom));
}
Expand All @@ -290,7 +296,7 @@ class HassTabsSubpage extends LitElement {
bottom: calc(16px + env(safe-area-inset-bottom));
z-index: 1;
}
:host([narrow]) #fab {
:host([narrow]) #fab.tabs {
bottom: calc(84px + env(safe-area-inset-bottom));
}
#fab[is-wide] {
Expand Down