Skip to content

Changed button to text #4067

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
bramkragten merged 3 commits into from
Oct 21, 2019
Merged

Changed button to text #4067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59989a9
Changed button to text
drakeloud Oct 19, 2019
fc2e3ba
Moved styles to hui-edit-view
drakeloud Oct 21, 2019
a55fa46
prettier updates
drakeloud Oct 21, 2019
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
9 changes: 3 additions & 6 deletions src/panels/lovelace/editor/view-editor/hui-edit-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,9 @@ export class HuiEditView extends LitElement {
<div class="paper-dialog-buttons">
${this.viewIndex !== undefined
? html`
<paper-icon-button
class="delete"
title="Delete"
icon="hass:delete"
@click="${this._delete}"
></paper-icon-button>
<mwc-button class="warning left-align" @click="${this._delete}">
${this.hass!.localize("ui.common.delete_view")}
</mwc-button>
`
: ""}
<mwc-button @click="${this._closeDialog}"
Expand Down
4 changes: 4 additions & 0 deletions src/resources/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ export const haStyleDialog = css`
--mdc-theme-primary: var(--google-red-500);
}

.paper-dialog-buttons .warning.left-align {
margin-right: auto;
}

@bramkragten bramkragten Oct 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this to hui-edit-views static get styles(), there is a .delete class there that was used for the button, should clean that up and replace with the new styles.


@media all and (max-width: 450px), all and (max-height: 500px) {
paper-dialog,
ha-paper-dialog {
Expand Down
1 change: 1 addition & 0 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@
"common": {
"loading": "Loading",
"cancel": "Cancel",
"delete_view": "Delete View",

@bramkragten bramkragten Oct 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/home-assistant/home-assistant-polymer/blob/59989a902ce1136cdcb3afa6fb303bb059f2eb05/src/translations/en.json#L1386

@bramkragten bramkragten Oct 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be in common but in the section of lovelace and the views, there actually already is a key for delete there.

@drakeloud drakeloud Oct 21, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bramkragten I didn't realize those existed in en.json.

"save": "Save",
"successfully_saved": "Successfully saved"
},
Expand Down