Fix layout of the "Solve Conflicts" modal #1470
Merged
Conversation
This file contains 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
Update packages: cross-spawn, express, path-to-regexp, http-proxy-middleware, nanoid
Antonio-Maranhao
force-pushed
the
fix-layout-conflicts-confirmation-modal
branch
from
290bcbe to
b375bd4
Compare
Antonio-Maranhao
force-pushed
the
fix-layout-conflicts-confirmation-modal
branch
from
6da0be8 to
bbf7c3d
Compare
fryjordan
approved these changes
Jan 20, 2025
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.
Overview
Fix alignment of the footer elements in the "Solve Conflicts" confirmation modal:
<div class="col-auto">Includes:
npm audit fixnpminstalled requires Node 20+Testing recommendations
Open a document with conflicts, then click 'Select as winner' button to show the Modal.
GitHub issue number
n/a
Related Pull Requests
n/a
Checklist