Skip to content

Commit 6a7f125

Browse files
committed
Simplifies create branch action on graph
1 parent 24c8169 commit 6a7f125

File tree

2 files changed

+7
-79
lines changed

2 files changed

+7
-79
lines changed

src/webviews/apps/plus/graph/GraphWrapper.tsx

Lines changed: 6 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,90 +1145,25 @@ export function GraphWrapper({
11451145
</>
11461146
)}
11471147
</div>
1148-
<div className="titlebar__group--last">
1149-
<span className="button-group">
1148+
<div className="titlebar__group">
11501149
<GlTooltip placement="bottom">
11511150
<a
11521151
className="action-button"
11531152
href={createCommandLink(Commands.GitCommandsBranch, {
11541153
args: {
1155-
state: { subcommand: 'create', flags: ['--switch'], reference: branch },
1156-
command: 'branch',
1157-
confirm: false,
1158-
} satisfies BranchGitCommandArgs,
1159-
})}
1160-
>
1161-
<span className="codicon codicon-custom-git-branch-create action-button__icon"></span>
1162-
</a>
1163-
<span slot="content">
1164-
Create a branch from <i>{branchName}</i> and switch
1165-
</span>
1166-
</GlTooltip>
1167-
<GlPopover
1168-
className="popover"
1169-
placement="bottom-start"
1170-
trigger="focus"
1171-
arrow={false}
1172-
distance={0}
1173-
>
1174-
<GlTooltip placement="top" distance={7} slot="anchor">
1175-
<button type="button" className="action-button" aria-label="Minimap Options">
1176-
<span
1177-
className="codicon codicon-chevron-down action-button__more"
1178-
aria-hidden="true"
1179-
></span>
1180-
</button>
1181-
<span slot="content">Create branch options</span>
1182-
</GlTooltip>
1183-
<div slot="content">
1184-
<MenuLabel>Create branch options</MenuLabel>
1185-
<MenuItem href={createCommandLink(Commands.GitCommandsBranchCreate)}>
1186-
Create Branch...
1187-
</MenuItem>
1188-
<MenuItem
1189-
href={createCommandLink(Commands.GitCommandsBranch, {
1190-
args: {
1191-
command: 'branch',
1192-
confirm: false,
1193-
state: { flags: [], reference: branch, subcommand: 'create' },
1194-
} satisfies BranchGitCommandArgs,
1195-
})}
1196-
>
1197-
Create Branch from <i>{branchName}</i>
1198-
</MenuItem>
1199-
<MenuItem
1200-
href={createCommandLink(Commands.GitCommandsBranch, {
1201-
args: {
1202-
command: 'branch',
1203-
confirm: false,
12041154
state: {
1205-
flags: ['--switch'],
1206-
reference: branch,
12071155
subcommand: 'create',
1208-
},
1209-
} satisfies BranchGitCommandArgs,
1210-
})}
1211-
>
1212-
Create from <i>{branchName}</i> & Switch to Branch
1213-
</MenuItem>
1214-
<MenuItem
1215-
href={createCommandLink(Commands.GitCommandsBranch, {
1216-
args: {
1217-
state: {
1218-
subcommand: 'create',
1219-
flags: ['--worktree'],
12201156
reference: branch,
12211157
},
12221158
command: 'branch',
1223-
confirm: false,
1159+
confirm: true,
12241160
} satisfies BranchGitCommandArgs,
12251161
})}
12261162
>
1227-
Create Branch from <i>{branchName}</i> in New Worktree
1228-
</MenuItem>
1229-
</div>
1230-
</GlPopover>
1231-
</span>
1163+
<span className="codicon codicon-custom-git-branch-create action-button__icon"></span>
1164+
</a>
1165+
<span slot="content">Create new branch</span>
1166+
</GlTooltip>
12321167
<GlTooltip placement="bottom">
12331168
<a
12341169
href={`command:gitlens.showLaunchpad?${encodeURIComponent(

src/webviews/apps/plus/graph/graph.scss

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -908,13 +908,6 @@ button:not([disabled]),
908908
}
909909
}
910910

911-
&__group--last {
912-
display: flex;
913-
gap: 0.5rem;
914-
flex-shrink: 0;
915-
width: auto;
916-
}
917-
918911
&,
919912
&__row {
920913
justify-content: space-between;
@@ -993,7 +986,7 @@ gl-feature-gate gl-feature-badge {
993986
&__header {
994987
flex: none;
995988
z-index: 101;
996-
width: fit-content;
989+
// width: fit-content;
997990
position: relative;
998991
}
999992

0 commit comments

Comments
 (0)