8000 revert: handle disabled button styles" by Ldoppea · Pull Request #1065 · cozy/cozy-flagship-app · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

revert: handle disabled button styles" #1065

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
Merged
merged 1 commit into from
Dec 13, 2023
Merged

revert: handle disabled button styles" #1065

merged 1 commit into from
Dec 13, 2023

Conversation

Ldoppea
Copy link
Member
@Ldoppea Ldoppea commented Dec 12, 2023

This reverts commit b11fb15

This commit collides with the CozyThem PR implementation. The easiest way to handle conflicts is to revert this commit and to reapply the disable condition for the SetPinView button

Related PR: #1062

@Ldoppea
revert: handle disabled button styles"
02058d0 
This reverts commit b11fb15

This commit collides with the CozyThem PR implementation. The easiest
way to handle conflicts is to revert this commit and to reapply the
disable condition for the SetPinView button

Related PR: #1062
Ldoppea added a commit that referenced this pull request Dec 12, 2023
@Ldoppea
feat: Reapply disabled state on SetPinView's buttons
1046a7e 
This reapplies changes that were reverted by #1065 but without style
edits already handled by the new CozyTheme feature

Related PR: #1065
@Ldoppea Ldoppea mentioned this pull request Dec 12, 2023
Merged
1 task
@Ldoppea Ldoppea merged commit 1f7cd4d into master Dec 13, 2023
@Ldoppea Ldoppea deleted the fix/revert_disable_style branch December 13, 2023 11:09
Ldoppea added a commit that referenced this pull request Dec 13, 2023
@Ldoppea
feat: Reapply disabled state on SetPinView's buttons
23aaff9 
This reapplies changes that were reverted by #1065 but without style
edits already handled by the new CozyTheme feature

Related PR: #1065
Ldoppea added a commit that referenced this pull request Dec 13, 2023
@Ldoppea
feat: Reapply disabled state on SetPinView's buttons
c8ebe5a 
This reapplies changes that were reverted by #1065 but without style
edits already handled by the new CozyTheme feature

Related PR: #1065
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acezard acezard acezard approved these changes

@zat 55A1 teo zatteo Awaiting requested review from zatteo zatteo is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Ldoppea @acezard
0