development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 05:19:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Wrap actual line contents so they're not affected by parent's display: flex

Browse source
This commit is contained in:
Sergio Padrino 2023-09-25 18:45:47 +02:00
parent 7f966b4565
commit 7517283d5d
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/ui/diff/side-by-side-diff-row.tsx
View file

@ -357,13 +357,15 @@ export class SideBySideDiffRow extends React.Component<
return ( return (
<div className="content" onContextMenu={this.props.onContextMenuText}> <div className="content" onContextMenu={this.props.onContextMenuText}>
<div className="prefix">&nbsp;&nbsp;{prefix}&nbsp;&nbsp;</div> <div className="prefix">&nbsp;&nbsp;{prefix}&nbsp;&nbsp;</div>
{syntaxHighlightLine(data.content, data.tokens)} <div className="content-wrapper">
{data.noNewLineIndicator && ( {syntaxHighlightLine(data.content, data.tokens)}
<Octicon {data.noNewLineIndicator && (
symbol={narrowNoNewlineSymbol} <Octicon
title="No newline at end of file" symbol={narrowNoNewlineSymbol}
/> title="No newline at end of file"
)} />
)}
</div>
</div> </div>
) )
} }