Skip to content
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

Jump to bottom

"skip" is confusing for a lot of users #2589

Merged
merged 1 commit into from Jan 27, 2019
Merged

"skip" is confusing for a lot of users #2589

merged 1 commit into from Jan 27, 2019

Conversation

iantrich
Copy link
Member

Hopefully this will clear up the ambiguity for users.

@iantrich
"skip" is confusing for a lot of users
03a9ffb 
Hopefully this will clear up the ambiguity for users.
@ghost ghost assigned iantrich Jan 27, 2019
@ghost ghost added the in progress label Jan 27, 2019
balloob
balloob reviewed Jan 27, 2019
View reviewed changes
src/panels/lovelace/editor/card-editor/hui-dialog-pick-card.ts
@@ -40,7 +40,7 @@ export class HuiDialogPickCard extends hassLocalizeLitMixin(LitElement) {
></hui-card-picker>
</paper-dialog-scrollable>
<div class="paper-dialog-buttons">
<paper-button @click="${this._skipPick}">SKIP</paper-button>
<paper-button @click="${this._skipPick}">CUSTOM CARD</paper-button>
Copy link
Member

Choose a reason for hiding this comment

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

hmm. I prefer "MANUAL", as it is not limited to custom cards.

Copy link
Member Author

Choose a reason for hiding this comment

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

meet me half way with "MANUAL CARD"? 😄

Copy link
Member

Choose a reason for hiding this comment

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

Ok with me.

@bramkragten @zsarnett , opinions?

Copy link
Member

Choose a reason for hiding this comment

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

Fine by me

Copy link
Member

Choose a reason for hiding this comment

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

Ship it

Copy link
Member

Choose a reason for hiding this comment

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

Ooooppsss...

@bramkragten bramkragten merged commit ccb1299 into dev Jan 27, 2019
@ghost ghost removed the in progress label Jan 27, 2019
@delete-merged-branch delete-merged-branch bot deleted the iantrich-patch-1 branch January 27, 2019 19:58
bramkragten added a commit that referenced this pull request Jan 27, 2019
@bramkragten
Revert ""skip" is confusing for a lot of users (#2589)"
d288026 
This reverts commit ccb1299.
@bramkragten bramkragten restored the iantrich-patch-1 branch January 27, 2019 19:59
@bramkragten bramkragten deleted the iantrich-patch-1 branch January 27, 2019 20:18
bramkragten added a commit that referenced this pull request Jan 27, 2019
@bramkragten
Revert ""skip" is confusing for a lot of users (#2589)" (#2595)
3e1c22e 
* Revert ""skip" is confusing for a lot of users (#2589)"

This reverts commit ccb1299.

* And the agreed name
@balloob balloob mentioned this pull request Jan 31, 2019
Merged
@github-actions github-actions bot locked and limited conversation to collaborators Jul 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@balloob balloob balloob left review comments

@bramkragten bramkragten Awaiting requested review from bramkragten

Assignees

@iantrich iantrich

Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@iantrich @balloob @bramkragten @homeassistant