|
|
|
@ -1364,7 +1364,14 @@ export function Workspace() { |
|
|
|
|
</button> } |
|
|
|
|
</div> |
|
|
|
|
</CustomTooltip> |
|
|
|
|
: null} |
|
|
|
|
: null |
|
|
|
|
} |
|
|
|
|
<CustomTooltip |
|
|
|
|
placement="top" |
|
|
|
|
tooltipId="branchesDropdown" |
|
|
|
|
tooltipClasses="text-nowrap" |
|
|
|
|
tooltipText={'Current branch: ' + currentBranch || 'Branches'} |
|
|
|
|
> |
|
|
|
|
<div className="pt-0 mr-2" data-id="workspaceGitBranchesDropdown"> |
|
|
|
|
<Dropdown style={{ height: 30, width: "7rem" }} onToggle={toggleBranches} show={showBranches} drop={'up'}> |
|
|
|
|
<Dropdown.Toggle |
|
|
|
@ -1375,7 +1382,6 @@ export function Workspace() { |
|
|
|
|
> |
|
|
|
|
{global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : currentBranch || '-none-'} |
|
|
|
|
</Dropdown.Toggle> |
|
|
|
|
|
|
|
|
|
<Dropdown.Menu as={CustomMenu} className="custom-dropdown-items branches-dropdown"> |
|
|
|
|
<div data-id="custom-dropdown-menu"> |
|
|
|
|
<div className="d-flex text-dark" style={{ fontSize: 14, fontWeight: 'bold' }}> |
|
|
|
@ -1451,6 +1457,7 @@ export function Workspace() { |
|
|
|
|
</Dropdown.Menu> |
|
|
|
|
</Dropdown> |
|
|
|
|
</div> |
|
|
|
|
</CustomTooltip> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
)} |
|
|
|
|