development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-06-30 22:54:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14470 from desktop/fix-long-list-conflicts

Browse Source 
Make long lists of files scrollable within dialogs
This commit is contained in:
Sergio Padrino 2022-04-28 15:32:31 +02:00 committed by GitHub
commit 24db7e1f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/ui/discard-changes/discard-changes-dialog.tsx
View File

@ -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>
)
}

19
app/styles/ui/_discard-changes.scss
View File

@ -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;
}
}
}

23
app/styles/ui/dialogs/_commit-conflicts-warning.scss
View File

@ -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);
}
}
}
}