Skip to content

fix(ui): style conflict resolution buttons - #6964

Merged
juliusknorr merged 5 commits into
mainfrom
ui/review-with-marco
Mar 18, 2025
Merged

fix(ui): style conflict resolution buttons#6964
juliusknorr merged 5 commits into
mainfrom
ui/review-with-marco

Conversation

@max-nextcloud

@max-nextcloudmax-nextcloud commented Mar 17, 2025

Copy link
Copy Markdown
Collaborator

Fixes#2240

🖼️ Screenshots

🏚️ Before🏡 After
Bildschirmfoto vom 2025-03-18 09-27-26grafik

@codecov

codecovBot commented Mar 17, 2025

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.82%. Comparing base (44c93ca) to head (c12d869).
Report is 6 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #6964 +/- ##
==========================================
- Coverage 51.82% 51.82% -0.01% 
==========================================
Files 476 476 Lines 40154 40148 -6 Branches 985 984 -1 ==========================================
- Hits 20811 20805 -6 
Misses 19237 19237 Partials 106 106 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@max-nextcloudmax-nextcloud self-assigned this Mar 17, 2025
@github-project-automationgithub-project-automationBot moved this to 🧭 Planning evaluation (don't pick) in 📝 Productivity teamMar 17, 2025
@max-nextcloudmax-nextcloud moved this from 🧭 Planning evaluation (don't pick) to 👀 In review in 📝 Productivity teamMar 17, 2025
@max-nextcloudmax-nextcloud added design Experience, interaction, interface, … 3. to review ux labels Mar 17, 2025
@max-nextcloud
max-nextcloud requested review from a team and marcoambrosiniMarch 17, 2025 12:54
@max-nextcloud
max-nextcloudforce-pushed the ui/review-with-marco branch 3 times, most recently from 4c37ee1 to 9447458CompareMarch 18, 2025 08:25
@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable31

@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable30

max-nextcloudand others added 4 commits March 18, 2025 09:38
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Marco Ambrosini <marcoambrosini@Mac.home>
Signed-off-by: Marco Ambrosini <marcoambrosini@Mac.home>
Signed-off-by: Max <max@nextcloud.com>
@juliusknorr
juliusknorr merged commit fe81182 into mainMar 18, 2025
@juliusknorr
juliusknorr deleted the ui/review-with-marco branch March 18, 2025 10:13
@github-project-automationgithub-project-automationBot moved this from 👀 In review to ☑️ Done in 📝 Productivity teamMar 18, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewdesignExperience, interaction, interface, …ux

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

Improve error and conflict design

3 participants

@max-nextcloud@juliusknorr@marcoambrosini