mirror of
https://github.com/desktop/desktop
synced 2024-10-31 05:19:03 +00:00
Wrap actual line contents so they're not affected by parent's display: flex
This commit is contained in:
parent
7f966b4565
commit
7517283d5d
1 changed files with 9 additions and 7 deletions
|
@ -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"> {prefix} </div>
|
<div className="prefix"> {prefix} </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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue