Merge main + resolve 38 conflicts; combine best of both UI improvement branches#2
Draft
Merge main + resolve 38 conflicts; combine best of both UI improvement branches#2
Conversation
…Changes tab, better footer Co-authored-by: triadastra <260350342+triadastra@users.noreply.github.com>
Co-authored-by: triadastra <260350342+triadastra@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Enhance UI and UX for better utilization
Improve UI clarity and visual hierarchy across all views
Mar 5, 2026
- Apply HEAD tab titles with icons - Apply HEAD PaletteAction labels - Use HEAD show_command_palette with shortcut badges - Use HEAD show_command_bar with FETCH_HEAD empty state - Combine left rail: empty state + accent dot + HEAD status chips - Combine render_changes_tab: HEAD cards + section_header + filter message - Use HEAD render_history_tab, render_branches_tab - Use FETCH_HEAD sync_state_card in render_sync_tab - Use HEAD render_conflicts_tab with updated heading - Use FETCH_HEAD render_recovery_tab - Use HEAD show_footer - Add section_header, sync_state_card helper functions Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot
AI
changed the title
Improve UI clarity and visual hierarchy across all views
Merge main + resolve 38 conflicts; combine best of both UI improvement branches
Mar 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two parallel UI overhaul branches (
copilot/improve-ui-uxandcopilot/improve-ui-ux-design) diverged from the same base and both heavily modifiedsrc/app.rs, producing 38 conflict regions aftermainwas updated via PR #1.Merge strategy
Required
--allow-unrelated-historiesdue to shallow/grafted clone ancestry.Conflict resolution
Kept from this branch
⊕ Changes·⌚ History·⑂ Branches·⟳ Sync·⚡ Conflicts·↩ Recoveryrepo / ⑂ branch ↑N ↓N)Incorporated from
mainsection_header(title, count, accent)— replaceschanges_section_header; adds a count badge to each sectionsync_state_card(label, value, bg, fg)— card abstraction used in the Sync tabFrame💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.