diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts index 833278454a..3797bd24e9 100644 --- a/src/panels/lovelace/cards/hui-entities-card.ts +++ b/src/panels/lovelace/cards/hui-entities-card.ts @@ -187,6 +187,9 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard { return css` ha-card { height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; } .card-header { display: flex; @@ -199,6 +202,10 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard { text-overflow: ellipsis; } + #states { + flex: 1; + } + #states > * { margin: 8px 0; } diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts index 24d9470075..6d0f2aa4f8 100644 --- a/src/panels/lovelace/cards/hui-entity-card.ts +++ b/src/panels/lovelace/cards/hui-entity-card.ts @@ -189,6 +189,12 @@ export class HuiEntityCard extends LitElement implements LovelaceCard { static get styles(): CSSResult { return css` + ha-card { + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + } ha-card > div { cursor: pointer; } diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts index 70e807d45e..5bbdb62781 100644 --- a/src/panels/lovelace/cards/hui-light-card.ts +++ b/src/panels/lovelace/cards/hui-light-card.ts @@ -125,16 +125,17 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
- ${supportsFeature(stateObj, SUPPORT_BRIGHTNESS) - ? html` - - ` - : ""} + -
-
- ${slider} -
-
- ${currentTemperature} ${setValues} +
+
+
+ ${slider} +
+
+ ${currentTemperature} ${setValues} +
-
-
-
- ${(stateObj.attributes.hvac_modes || []) - .concat() - .sort(compareClimateHvacModes) - .map((modeItem) => this._renderIcon(modeItem, mode))} +
+
+ ${(stateObj.attributes.hvac_modes || []) + .concat() + .sort(compareClimateHvacModes) + .map((modeItem) => this._renderIcon(modeItem, mode))} +
+ ${name}
- ${name}
`; @@ -423,6 +425,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { } ha-card { + height: 100%; position: relative; overflow: hidden; --name-font-size: 1.2rem; @@ -481,6 +484,13 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { z-index: 25; } + .content { + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + } + #controls { display: flex; justify-content: center;