Skip to content

Weather Card: Switch Importance of Name and State #5624

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
zsarnett merged 2 commits into from
Apr 27, 2020
Merged

Weather Card: Switch Importance of Name and State #5624

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
8ff9d55
Improvements to the name and state importance
zsarnett Apr 24, 2020
4adc35c
Bram Suggestions
zsarnett Apr 27, 2020
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: 2 additions & 2 deletions src/data/weather.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,15 @@ const getWeatherExtrema = (
${
tempHigh
? `
${hass!.localize(`ui.card.weather.high`)} ${tempHigh} ${unit}
${tempHigh} ${unit}
`
: ""
}
${tempLow && tempHigh ? " / " : ""}
${
tempLow
? `
${hass!.localize(`ui.card.weather.low`)} ${tempLow} ${unit}
${tempLow} ${unit}
`
: ""
}
Expand Down
188 changes: 100 additions & 88 deletions src/panels/lovelace/cards/hui-weather-forecast-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
tabindex="0"
>
<div class="content">
<div class="icon-info">
<div class="icon-image">
${stateObj.state in weatherImages
? html`
<img
Expand All @@ -179,7 +179,9 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
.icon=${weatherIcons[stateObj.state] || stateIcon(stateObj)}
></ha-icon>
`}
<div class="info">
</div>
<div class="info">
<div class="name-state">
<div class="name">
${this._config.name || computeStateName(stateObj)}
</div>
Expand All @@ -191,15 +193,15 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
)}
</div>
</div>
</div>
<div class="temp-attribute">
<div class="temp">
${stateObj.attributes.temperature}<span
>${getWeatherUnit(this.hass, "temperature")}</span
>
</div>
<div class="attribute">
${getSecondaryWeatherAttribute(this.hass, stateObj)}
<div class="temp-attribute">
<div class="temp">
${stateObj.attributes.temperature}<span
>${getWeatherUnit(this.hass, "temperature")}</span
>
</div>
<div class="attribute">
${getSecondaryWeatherAttribute(this.hass, stateObj)}
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -312,7 +314,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
} else {
this.removeAttribute("verynarrow");
}
if (this.offsetWidth < 200) {
if (this.offsetWidth < 225) {
this.setAttribute("veryverynarrow", "");
} else {
this.removeAttribute("veryverynarrow");
Expand All @@ -337,61 +339,72 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
align-items: center;
}

.icon-info {
.icon-image {
display: flex;
align-items: center;
min-width: 0;
flex: 1;
min-width: 64px;
margin-right: 16px;
}

.weather-image,
.weather-icon {
flex: 0 0 66px;
margin-right: 16px;
flex: 0 0 64px;
}

.weather-icon {
--iron-icon-width: 66px;
--iron-icon-height: 66px;
--iron-icon-width: 64px;
--iron-icon-height: 64px;
}

.info {
display: flex;
justify-content: space-between;
flex-grow: 1;
overflow: hidden;
}

.name {
font-size: 16px;
color: var(--secondary-text-color);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.state {
font-size: 28px;
line-height: 1.2;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.temp-attribute {
display: flex;
flex-direction: column;
align-items: flex-end;
text-align: right;
}

.temp-attribute .temp {
position: relative;
font-size: 38px;
line-height: 1;
margin-right: 24px;
}

.temp-attribute .temp span {
position: absolute;
font-size: 24px;
top: 4px;
top: 1px;
}

.name,
.temp-attribute .temp {
font-size: 28px;
line-height: 1.2;
}

.state,
.attribute {
font-size: 14px;
line-height: 1;
}

.name-state {
overflow: hidden;
padding-right: 12px;
width: 100%;
}

.name,
.state {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.attribute {
white-space: nowrap;
}

.forecast {
Expand Down Expand Up @@ -427,88 +440,87 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
--iron-icon-height: 40px;
}

.attribute {
line-height: 1;
}

.attribute,
.templow {
.templow,
.state {
color: var(--secondary-text-color);
}

:host([narrow]) .weather-image {
flex: 0 0 58px;
}

:host([narrow]) .weather-icon {
--iron-icon-width: 58px;
--iron-icon-height: 58px;
.unavailable {
height: 100px;
display: flex;
justify-content: center;
align-items: center;
font-size: 16px;
padding: 10px 20px;
text-align: center;
}

:host([narrow]) .state {
font-size: 22px;
}
/* ============= NARROW ============= */

:host([narrow]) .temp-attribute .temp {
font-size: 44px;
margin-right: 18px;
:host([narrow]) .icon-image {
min-width: 52px;
}

:host([narrow]) .temp-attribute .temp span {
font-size: 18px;
top: 3px;
:host([narrow]) .weather-image {
flex: 0 0 52px;
width: 52px;
}

:host([narrow]) .attribute {
display: none;
:host([narrow]) .weather-icon {
--iron-icon-width: 52px;
--iron-icon-height: 52px;
}

:host([narrow]) .forecast {
justify-content: space-around;
}

:host([veryVeryNarrow]) .content {
flex-wrap: wrap;
justify-content: center;
:host([narrow]) .name,
:host([narrow]) .temp-attribute .temp {
font-size: 22px;
}

:host([veryNarrow]) .icon-info {
flex: initial;
:host([narrow]) .temp-attribute .temp {
margin-right: 16px;
}

:host([narrow]) .weather-image {
flex: 0 0 48px;
:host([narrow]) .temp span {
top: 1px;
font-size: 16px;
}

:host([narrow]) .weather-icon {
--iron-icon-width: 48px;
--iron-icon-height: 48px;
}
/* ============= VERY NARROW ============= */

:host([veryNarrow]) .info {
:host([veryNarrow]) .state,
:host([veryNarrow]) .attribute {
display: none;
}

:host([veryNarrow]) .temp-attribute .temp {
font-size: 36px;
:host([veryNarrow]) .info {
flex-direction: column;
align-items: flex-start;
}

:host([veryNarrow]) .temp-attribute .temp span {
top: 2px;
:host([veryNarrow]) .name-state {
padding-right: 0;
}

:host([veryVeryNarrow]) .temp-attribute {
/* ============= VERY VERY NARROW ============= */

:host([veryVeryNarrow]) .info {
padding-top: 4px;
align-items: center;
}

.unavailable {
height: 100px;
display: flex;
:host([veryVeryNarrow]) .content {
flex-wrap: wrap;
justify-content: center;
align-items: center;
font-size: 16px;
padding: 10px 20px;
text-align: center;
flex-direction: column;
}

:host([veryVeryNarrow]) .icon-image {
margin-right: 0;
}
`;
}
Expand Down