Skip to content

Merge main into upgrade branch and add missing pill element styles#25

Merged
andyD123 merged 4 commits into
Upgradefrom
copilot/sub-pr-21-another-one
Dec 23, 2025
Merged

Merge main into upgrade branch and add missing pill element styles#25
andyD123 merged 4 commits into
Upgradefrom
copilot/sub-pr-21-another-one

Conversation

Copilot AI commented Dec 23, 2025

Copy link
Copy Markdown
Contributor

Resolved merge conflicts between the upgrade branch and main while preserving enhancements to the matrix chain DP visualization (Godbolt links, Overload article reference).

Changes

  • Merge resolution: Kept enhanced HTML structure with external resource links over simpler main branch version
  • Missing styles: Added CSS for .pill, .pill-row, .title-row elements that were referenced in HTML but had no corresponding styles
.pill {
    display: inline-flex;
    padding: 6px 14px;
    border-radius: 999px;
    background: rgba(0, 217, 255, 0.12);
    border: 1px solid rgba(0, 217, 255, 0.35);
}

Technical notes

CSS indentation follows existing codebase convention (visual nesting for related selectors, though not functionally significant in plain CSS).


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

andyD123 and others added 2 commits December 20, 2025 20:33
* vcproj update

* change number of steps to compare tree to wilmott article https://wilmott.com/automatic-for-the-greeks/

* getting local builds working again

* update demo code with comparison and pairwise reduce

* add interactive matrix chain DP visualization (C++ on sea demo)
Copilot AI and others added 2 commits December 23, 2025 01:26
Co-authored-by: andyD123 <4194901+andyD123@users.noreply.github.com>
# Conflicts:
#	index.html
#	style.css
Copilot AI changed the title [WIP] Update CSS sheet for matrix DP example Merge main into upgrade branch and add missing pill element styles Dec 23, 2025
Copilot AI requested a review from andyD123 December 23, 2025 01:30
@andyD123 andyD123 marked this pull request as ready for review December 23, 2025 01:30
@andyD123 andyD123 merged commit d91f51d into Upgrade Dec 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants