mirror of
https://github.com/desktop/desktop
synced 2024-10-01 05:43:50 +00:00
Merge pull request #14470 from desktop/fix-long-list-conflicts
Make long lists of files scrollable within dialogs
This commit is contained in:
commit
24db7e1f22
|
@ -137,13 +137,15 @@ export class DiscardChanges extends React.Component<
|
|||
return (
|
||||
<div>
|
||||
<p>Are you sure you want to discard all changes to:</p>
|
||||
<ul>
|
||||
{this.props.files.map(p => (
|
||||
<li key={p.id}>
|
||||
<PathText path={p.path} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
<div className="file-list">
|
||||
<ul>
|
||||
{this.props.files.map(p => (
|
||||
<li key={p.id}>
|
||||
<PathText path={p.path} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1,12 +1,17 @@
|
|||
#discard-changes {
|
||||
.dialog-content ul {
|
||||
list-style: none;
|
||||
margin: var(--spacing) 0;
|
||||
padding: 0;
|
||||
.dialog-content .file-list {
|
||||
max-height: 175px;
|
||||
overflow-y: auto;
|
||||
|
||||
li {
|
||||
padding-left: 0;
|
||||
margin-bottom: 0;
|
||||
ul {
|
||||
list-style: none;
|
||||
margin: var(--spacing) 0;
|
||||
padding: 0;
|
||||
|
||||
li {
|
||||
padding-left: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +1,19 @@
|
|||
#commit-conflict-markers-warning {
|
||||
.dialog-content ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
margin-bottom: var(--spacing);
|
||||
.dialog-content .conflicted-files-text {
|
||||
max-height: 175px;
|
||||
overflow-y: auto;
|
||||
|
||||
li {
|
||||
padding-left: 0;
|
||||
margin-bottom: 0;
|
||||
font-family: var(--font-family-monospace);
|
||||
ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
margin-bottom: var(--spacing);
|
||||
|
||||
li {
|
||||
padding-left: 0;
|
||||
margin-bottom: 0;
|
||||
font-family: var(--font-family-monospace);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue