fixed spinner

pull/5370/head
lianahus 5 months ago committed by Aniket
parent 364df8b14c
commit ebdd1e7d27
  1. 16
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@ -1355,11 +1355,11 @@ export function Workspace() {
tooltipText={<FormattedMessage id="filePanel.updateSubmodules" />} tooltipText={<FormattedMessage id="filePanel.updateSubmodules" />}
> >
<div className="pr-1"> <div className="pr-1">
{global.fs.browser.isRequestingCloning ? <button style={{ height: 30, minWidth: "8rem" }} className='btn btn-sm border text-dark'> { global.fs.browser.isRequestingCloning ? <button style={{ height: 30, minWidth: "9rem" }} className='btn btn-sm border text-dark'>
<i className="fad fa-spinner fa-spin"></i> <i className="fad fa-spinner fa-spin"></i>
Updating submodules Updating submodules
</button> : </button> :
<button style={{ height: 30, minWidth: "8rem" }} onClick={updateSubModules} data-id='updatesubmodules' className={`btn btn-sm border ${highlightUpdateSubmodules ? 'text-warning' : 'text-dark'}`}> <button style={{ height: 30, minWidth: "9rem" }} onClick={updateSubModules} data-id='updatesubmodules' className={`btn btn-sm border ${highlightUpdateSubmodules ? 'text-warning' : 'text-dark'}`}>
Update submodules Update submodules
</button> } </button> }
</div> </div>
@ -1367,17 +1367,17 @@ export function Workspace() {
: null : null
} }
<CustomTooltip <CustomTooltip
placement="top" placement="right"
tooltipId="branchesDropdown" tooltipId="branchesDropdown"
tooltipClasses="text-nowrap" tooltipClasses="text-nowrap"
tooltipText={'Current branch: ' + currentBranch || 'Branches'} tooltipText={'Current branch: ' + currentBranch || 'Branches'}
> >
<div className="pt-0 mr-2" data-id="workspaceGitBranchesDropdown"> <div className="pt-0 mr-2" data-id="workspaceGitBranchesDropdown">
<Dropdown style={{ height: 30, width: "7rem" }} onToggle={toggleBranches} show={showBranches} drop={'up'}> <Dropdown style={{ height: 30, maxWidth: "6rem", minWidth: "6rem" }} onToggle={toggleBranches} show={showBranches} drop={'up'}>
<Dropdown.Toggle <Dropdown.Toggle
as={CustomToggle} as={CustomToggle}
id="dropdown-custom-components" id="dropdown-custom-components"
className="btn btn-sm btn-light btn-block w-100 d-inline-block border border-dark form-control h-100 p-0 pl-2 pr-2 text-dark" className="btn btn-sm btn-light d-inline-block border border-dark form-control h-100 p-0 pl-2 pr-2 text-dark"
icon={null} icon={null}
> >
{global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : currentBranch || '-none-'} {global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : currentBranch || '-none-'}
@ -1447,11 +1447,9 @@ export function Workspace() {
)} )}
</div> </div>
{(selectedWorkspace.branches || []).length > 4 && ( {(selectedWorkspace.branches || []).length > 4 && (
<div className="text-center border-top pt-2"> <button className="btn btn-sm w-100" style={{ cursor: "pointer" }} onClick={showAllBranches}>
<label style={{ fontSize: 12, cursor: 'pointer' }} onClick={showAllBranches}>
<FormattedMessage id="filePanel.viewAllBranches" /> <FormattedMessage id="filePanel.viewAllBranches" />
</label> </button>
</div>
)} )}
</div> </div>
</Dropdown.Menu> </Dropdown.Menu>

Loading…
Cancel
Save