RTL heater+state fixes (#13366)

This commit is contained in:
Yosi Levy 2022-08-25 17:20:04 +03:00 committed by GitHub
parent 1c05bc6380
commit a3d80f1280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 29 deletions

View File

@ -26,6 +26,7 @@ class HaWaterHeaterControl extends EventsMixin(PolymerElement) {
#target_temperature { #target_temperature {
@apply --layout-self-center; @apply --layout-self-center;
font-size: 200%; font-size: 200%;
direction: ltr;
} }
.control-buttons { .control-buttons {
font-size: 200%; font-size: 200%;

View File

@ -31,11 +31,16 @@ class HaWaterHeaterState extends LocalizeMixin(PolymerElement) {
font-weight: bold; font-weight: bold;
text-transform: capitalize; text-transform: capitalize;
} }
.label {
direction: ltr;
display: inline-block;
}
</style> </style>
<div class="target"> <div class="target">
<span class="state-label"> [[_localizeState(stateObj)]] </span> <span class="state-label label"> [[_localizeState(stateObj)]] </span>
[[computeTarget(hass, stateObj)]] <span class="label">[[computeTarget(hass, stateObj)]]</span>
</div> </div>
<template is="dom-if" if="[[currentStatus]]"> <template is="dom-if" if="[[currentStatus]]">

View File

@ -1,6 +1,5 @@
import "@lit-labs/virtualizer"; import "@lit-labs/virtualizer";
import "@material/mwc-list/mwc-list"; import "@material/mwc-list/mwc-list";
import "@material/mwc-list/mwc-list-item";
import type { ListItem } from "@material/mwc-list/mwc-list-item"; import type { ListItem } from "@material/mwc-list/mwc-list-item";
import { import {
mdiClose, mdiClose,
@ -34,6 +33,7 @@ import "../../components/ha-circular-progress";
import "../../components/ha-header-bar"; import "../../components/ha-header-bar";
import "../../components/ha-icon-button"; import "../../components/ha-icon-button";
import "../../components/ha-textfield"; import "../../components/ha-textfield";
import "../../components/ha-list-item";
import { fetchHassioAddonsInfo } from "../../data/hassio/addon"; import { fetchHassioAddonsInfo } from "../../data/hassio/addon";
import { domainToName } from "../../data/integration"; import { domainToName } from "../../data/integration";
import { getPanelNameTranslationKey } from "../../data/panel"; import { getPanelNameTranslationKey } from "../../data/panel";
@ -282,7 +282,7 @@ export class QuickBar extends LitElement {
private _renderEntityItem(item: EntityItem, index?: number) { private _renderEntityItem(item: EntityItem, index?: number) {
return html` return html`
<mwc-list-item <ha-list-item
.twoline=${Boolean(item.altText)} .twoline=${Boolean(item.altText)}
.item=${item} .item=${item}
index=${ifDefined(index)} index=${ifDefined(index)}
@ -307,13 +307,13 @@ export class QuickBar extends LitElement {
> >
` `
: null} : null}
</mwc-list-item> </ha-list-item>
`; `;
} }
private _renderCommandItem(item: CommandItem, index?: number) { private _renderCommandItem(item: CommandItem, index?: number) {
return html` return html`
<mwc-list-item <ha-list-item
.item=${item} .item=${item}
index=${ifDefined(index)} index=${ifDefined(index)}
class="command-item" class="command-item"
@ -336,7 +336,7 @@ export class QuickBar extends LitElement {
</span> </span>
<span class="command-text">${item.primaryText}</span> <span class="command-text">${item.primaryText}</span>
</mwc-list-item> </ha-list-item>
`; `;
} }
@ -363,7 +363,7 @@ export class QuickBar extends LitElement {
} }
private _getItemAtIndex(index: number): ListItem | null { private _getItemAtIndex(index: number): ListItem | null {
return this.renderRoot.querySelector(`mwc-list-item[index="${index}"]`); return this.renderRoot.querySelector(`ha-list-item[index="${index}"]`);
} }
private _addSpinnerToCommandItem(index: number): void { private _addSpinnerToCommandItem(index: number): void {
@ -457,7 +457,7 @@ export class QuickBar extends LitElement {
} }
private _handleItemClick(ev) { private _handleItemClick(ev) {
const listItem = ev.target.closest("mwc-list-item"); const listItem = ev.target.closest("ha-list-item");
this.processItemAndCloseDialog( this.processItemAndCloseDialog(
listItem.item, listItem.item,
Number(listItem.getAttribute("index")) Number(listItem.getAttribute("index"))
@ -771,11 +771,6 @@ export class QuickBar extends LitElement {
} }
} }
ha-icon.entity,
ha-svg-icon.entity {
margin-left: 20px;
}
ha-svg-icon.prefix { ha-svg-icon.prefix {
color: var(--primary-text-color); color: var(--primary-text-color);
} }
@ -809,11 +804,12 @@ export class QuickBar extends LitElement {
direction: var(--direction); direction: var(--direction);
} }
mwc-list-item { ha-list-item {
width: 100%; width: 100%;
--mdc-list-item-graphic-margin: 20px;
} }
mwc-list-item.command-item { ha-list-item.command-item {
text-transform: capitalize; text-transform: capitalize;
} }

View File

@ -75,30 +75,21 @@ export class StateCardDisplay extends LitElement {
return [ return [
haStyle, haStyle,
css` css`
:host([rtl]) {
direction: rtl;
text-align: right;
}
state-info { state-info {
flex: 1 1 auto; flex: 1 1 auto;
min-width: 0; min-width: 0;
} }
.state { .state {
color: var(--primary-text-color); color: var(--primary-text-color);
margin-left: 16px; margin-inline-start: 16px;
text-align: right; margin-inline-end: initial;
text-align: var(--float-end, right);
flex: 0 0 auto; flex: 0 0 auto;
overflow-wrap: break-word; overflow-wrap: break-word;
display: flex; display: flex;
align-items: center; align-items: center;
direction: ltr;
} }
:host([rtl]) .state {
margin-right: 16px;
margin-left: 0;
text-align: left;
}
.state.has-unit_of_measurement { .state.has-unit_of_measurement {
white-space: nowrap; white-space: nowrap;
} }