Skip to content

Commit 419a33a

Browse files
LianaHusAniket-Engg
authored andcommitted
fixed spinner
1 parent 5c7257d commit 419a33a

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,29 +1355,29 @@ export function Workspace() {
13551355
tooltipText={<FormattedMessage id="filePanel.updateSubmodules" />}
13561356
>
13571357
<div className="pr-1">
1358-
{global.fs.browser.isRequestingCloning ? <button style={{ height: 30, minWidth: "8rem" }} className='btn btn-sm border text-dark'>
1358+
{ global.fs.browser.isRequestingCloning ? <button style={{ height: 30, minWidth: "9rem" }} className='btn btn-sm border text-dark'>
13591359
<i className="fad fa-spinner fa-spin"></i>
13601360
Updating submodules
13611361
</button> :
1362-
<button style={{ height: 30, minWidth: "8rem" }} onClick={updateSubModules} data-id='updatesubmodules' className={`btn btn-sm border ${highlightUpdateSubmodules ? 'text-warning' : 'text-dark'}`}>
1362+
<button style={{ height: 30, minWidth: "9rem" }} onClick={updateSubModules} data-id='updatesubmodules' className={`btn btn-sm border ${highlightUpdateSubmodules ? 'text-warning' : 'text-dark'}`}>
13631363
Update submodules
13641364
</button> }
13651365
</div>
13661366
</CustomTooltip>
13671367
: null
13681368
}
13691369
<CustomTooltip
1370-
placement="top"
1370+
placement="right"
13711371
tooltipId="branchesDropdown"
13721372
tooltipClasses="text-nowrap"
13731373
tooltipText={'Current branch: ' + currentBranch || 'Branches'}
13741374
>
13751375
<div className="pt-0 mr-2" data-id="workspaceGitBranchesDropdown">
1376-
<Dropdown style={{ height: 30, width: "7rem" }} onToggle={toggleBranches} show={showBranches} drop={'up'}>
1376+
<Dropdown style={{ height: 30, maxWidth: "6rem", minWidth: "6rem" }} onToggle={toggleBranches} show={showBranches} drop={'up'}>
13771377
<Dropdown.Toggle
13781378
as={CustomToggle}
13791379
id="dropdown-custom-components"
1380-
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"
1380+
className="btn btn-sm btn-light d-inline-block border border-dark form-control h-100 p-0 pl-2 pr-2 text-dark"
13811381
icon={null}
13821382
>
13831383
{global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : currentBranch || '-none-'}
@@ -1447,11 +1447,9 @@ export function Workspace() {
14471447
)}
14481448
</div>
14491449
{(selectedWorkspace.branches || []).length > 4 && (
1450-
<div className="text-center border-top pt-2">
1451-
<label style={{ fontSize: 12, cursor: 'pointer' }} onClick={showAllBranches}>
1452-
<FormattedMessage id="filePanel.viewAllBranches" />
1453-
</label>
1454-
</div>
1450+
<button className="btn btn-sm w-100" style={{ cursor: "pointer" }} onClick={showAllBranches}>
1451+
<FormattedMessage id="filePanel.viewAllBranches" />
1452+
</button>
14551453
)}
14561454
</div>
14571455
</Dropdown.Menu>

0 commit comments

Comments
 (0)