feat: reorganize git view layout and add history/branch actions (#354)
* feat(ui): redesigned Git view layout * feat: stabilize git views layout with min-h-0 and scroll - Introduce min-h-0 and flex-1 on git layout containers - Apply min-h-0 on PR checks dialog content and related areas - Configure ScrollableOverlay to disable horizontal scroll and overscroll
This commit is contained in:
committed by
GitHub
parent
b432437b02
commit
0a425cd882
@@ -61,7 +61,7 @@ export const StashDialog: React.FC<StashDialogProps> = ({
|
||||
<DialogTitle>Uncommitted Changes</DialogTitle>
|
||||
</div>
|
||||
<DialogDescription>
|
||||
You have uncommitted changes that would be overwritten by {operation}.
|
||||
You have uncommitted changes that would be overwritten by this {operation}.
|
||||
Would you like to stash them temporarily?
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
@@ -72,7 +72,11 @@ export const StashDialog: React.FC<StashDialogProps> = ({
|
||||
</p>
|
||||
<ol className="list-decimal list-inside space-y-1 typography-meta text-foreground">
|
||||
<li>Stash your uncommitted changes</li>
|
||||
<li>{operationLabel} <span className="font-mono text-primary">{targetBranch}</span></li>
|
||||
<li>
|
||||
{operation === 'merge' ? 'Merge' : 'Rebase'}{' '}
|
||||
{operation === 'merge' ? 'with' : 'onto'}{' '}
|
||||
<span className="font-mono text-primary">{targetBranch}</span>
|
||||
</li>
|
||||
{restoreAfter && <li>Restore your stashed changes</li>}
|
||||
</ol>
|
||||
</div>
|
||||
@@ -88,7 +92,7 @@ export const StashDialog: React.FC<StashDialogProps> = ({
|
||||
className="typography-ui-label text-foreground cursor-pointer select-none"
|
||||
onClick={() => !isProcessing && setRestoreAfter(!restoreAfter)}
|
||||
>
|
||||
Restore changes after {operation}
|
||||
Restore changes after the {operation}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user