Review context in the Merge dialog

This commit is contained in:
Ian Gulliver
2026-10-16 09:49:58 -07:00
parent d328aa5e1f
commit 59c2b2cb9c
6 changed files with 322 additions and 21 deletions
+56
View File
@@ -1965,6 +1965,62 @@ pre.diff .mark {
margin: 0 0 16px;
}
.merge-into {
margin: 0 0 4px;
color: var(--muted);
}
.merge-title {
display: flex;
align-items: center;
gap: 8px;
margin: 0 0 16px;
font-weight: 700;
overflow-wrap: anywhere;
}
.merge-title input {
font-weight: 400;
}
.merge-title-edit {
padding: 0 6px;
border-color: transparent;
background: none;
color: var(--muted);
font-weight: 400;
}
.merge-warnings {
list-style: none;
margin: 0 0 16px;
padding: 0;
color: var(--warn);
}
.merge-warning-link {
padding: 0;
border: none;
background: none;
color: inherit;
text-align: left;
text-decoration: underline;
}
.merge-coauthors {
margin: 0 0 16px;
color: var(--muted);
}
.merge-coauthors summary {
cursor: pointer;
}
.merge-coauthors .modal-text {
margin: 8px 0 0;
color: var(--text);
}
.shortcuts-title {
margin: 0 0 12px;
font-size: 1.1em;