14bc63e813
Implements a pull-based merge workflow by wiring the merger pull helpers from the engine, extending the git pull and stash routes, and aligning the `MergeAdvanceNotice` and `StashConflictModal` components to gate dismissal on stash drop. The `run-audit` module is updated with pull mutation documenta Fusion-Task-Id: FN-5419 Co-authored-by: Fusion (runfusion.ai) <noreply@runfusion.ai> Fusion-Task-Id: FN-5419
77 lines
1.3 KiB
CSS
77 lines
1.3 KiB
CSS
.stash-conflict-modal {
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: var(--space-md);
|
|
}
|
|
|
|
.stash-conflict-modal__summary {
|
|
margin: 0;
|
|
color: var(--text);
|
|
}
|
|
|
|
.stash-conflict-modal__stash-row {
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
gap: var(--space-sm);
|
|
padding: var(--space-sm);
|
|
border: 1px solid var(--border);
|
|
border-radius: var(--radius-sm);
|
|
background: var(--surface);
|
|
}
|
|
|
|
.stash-conflict-modal__list {
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: var(--space-sm);
|
|
}
|
|
|
|
.stash-conflict-row {
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
gap: var(--space-sm);
|
|
padding: var(--space-sm);
|
|
border: 1px solid var(--border);
|
|
border-radius: var(--radius-sm);
|
|
background: var(--card);
|
|
}
|
|
|
|
.stash-conflict-row__path {
|
|
color: var(--text);
|
|
word-break: break-word;
|
|
}
|
|
|
|
.stash-conflict-row__actions {
|
|
display: flex;
|
|
flex-wrap: wrap;
|
|
gap: var(--space-xs);
|
|
}
|
|
|
|
.stash-conflict-modal__hint {
|
|
margin: 0;
|
|
color: var(--text-muted);
|
|
}
|
|
|
|
.stash-conflict-modal__warning {
|
|
margin: 0;
|
|
color: var(--color-warning);
|
|
}
|
|
|
|
.stash-conflict-modal__error {
|
|
margin: 0;
|
|
color: var(--color-error);
|
|
}
|
|
|
|
@media (max-width: 768px) {
|
|
.stash-conflict-row {
|
|
align-items: flex-start;
|
|
flex-direction: column;
|
|
}
|
|
|
|
.stash-conflict-row__actions {
|
|
width: 100%;
|
|
flex-direction: column;
|
|
}
|
|
}
|