Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions webviews/components/merge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,20 @@ export const MergeStatus = ({ mergeable, isSimple, canUpdateBranch }: { mergeabl
}
}
return (
<div className="status-item status-section">
{icon}
<p>
{summary}
</p>
{(action && canUpdateBranch) ?
<div className="button-container">
<button className="secondary" onClick={onClick} disabled={busy} >
{action}
</button>
</div>
: null}
<div className="status-section">
<div className="status-item">
{icon}
<p>
{summary}
</p>
{(action && canUpdateBranch) ?
<div className="button-container">
<button className="secondary" onClick={onClick} disabled={busy} >
{action}
</button>
</div>
: null}
</div>
</div>
);
};
Expand Down