Skip to content

Commit 2a8f0df

Browse files
Aniket-EnggAniket-Engg
committed
updated classes after topbar merge
1 parent ca68f12 commit 2a8f0df

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎libs/remix-ui/top-bar/src/components/WorkspaceDropdown.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
152152
<Dropdown.Menu
153153
as={CustomTopbarMenu}
154154
innerXPadding="px-2"
155-
className="custom-dropdown-items w-100"
155+
className="custom-dropdown-items w-100 bg-light"
156156
data-id="topbar-custom-dropdown-items"
157157
style={{
158158
overflow: 'visible'
@@ -203,7 +203,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
203203
{item.isGitRepo && item.currentBranch && (
204204
<i className="fas fa-code-branch pt-1"></i>
205205
)}
206-
<span className="pl-1">{item.name}</span>
206+
<span className="ps-1">{item.name}</span>
207207
</Dropdown.Item>
208208

209209
{/* submenu toggle */}
@@ -253,7 +253,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
253253
as={'button'}
254254
data-id="workspacesubMenuRename"
255255
>
256-
<span className="mr-2">
256+
<span className="me-2">
257257
<i className="far fa-edit" />
258258
</span>
259259
<span>Rename</span>
@@ -270,7 +270,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
270270
as={'button'}
271271
data-id="workspacesubMenuDuplicate"
272272
>
273-
<span className="mr-2">
273+
<span className="me-2">
274274
<i className="fas fa-copy" />
275275
</span>
276276
<span>Duplicate</span>
@@ -287,7 +287,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
287287
as={'button'}
288288
data-id="workspacesubMenuDownload"
289289
>
290-
<span className="mr-2">
290+
<span className="me-2">
291291
<i className="fas fa-download" />
292292
</span>
293293
<span>Download</span>
@@ -307,7 +307,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
307307
as={'button'}
308308
data-id="workspacesubMenuDelete"
309309
>
310-
<span className="mr-2">
310+
<span className="me-2">
311311
<i className="fas fa-trash" />
312312
</span>
313313
<span>Delete</span>
@@ -327,12 +327,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
327327
}}
328328
data-id="workspacecreate"
329329
>
330-
<span className="pl-2 " onClick={() => {
330+
<span className="ps-2 " onClick={() => {
331331
createWorkspace()
332332
setShowMain(false)
333333
setOpenSub(null)
334334
}}>
335-
<i className="fas fa-plus mr-2"></i>
335+
<i className="fas fa-plus me-2"></i>
336336
Create a new workspace
337337
</span>
338338
</li>
@@ -342,12 +342,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
342342
setShowMain(false)
343343
setOpenSub(null)
344344
}}>
345-
<span className="pl-2" style={{ color: '#D678FF' }} onClick={() => {
345+
<span className="ps-2" style={{ color: '#D678FF' }} onClick={() => {
346346
window.open('https://github.com/remix-project-org/remix-desktop/releases', '_blank')
347347
setShowMain(false)
348348
setOpenSub(null)
349349
}}>
350-
<i className="far fa-desktop mr-2"></i>
350+
<i className="far fa-desktop me-2"></i>
351351
Download Remix Desktop
352352
</span>
353353
</Dropdown.Item>
@@ -356,12 +356,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
356356
setShowMain(false)
357357
setOpenSub(null)
358358
}}>
359-
<span className="pl-2" onClick={() => {
359+
<span className="ps-2" onClick={() => {
360360
downloadWorkspaces()
361361
setShowMain(false)
362362
setOpenSub(null)
363363
}}>
364-
<i className="far fa-download mr-2"></i>
364+
<i className="far fa-download me-2"></i>
365365
Backup
366366
</span>
367367
</Dropdown.Item>
@@ -370,12 +370,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
370370
setShowMain(false)
371371
setOpenSub(null)
372372
}}>
373-
<span className="pl-2" onClick={() => {
373+
<span className="ps-2" onClick={() => {
374374
restoreBackup()
375375
setShowMain(false)
376376
setOpenSub(null)
377377
}}>
378-
<i className="fas fa-upload mr-2"></i>
378+
<i className="fas fa-upload me-2"></i>
379379
Restore
380380
</span>
381381
</Dropdown.Item>
@@ -384,12 +384,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
384384
setShowMain(false)
385385
setOpenSub(null)
386386
}}>
387-
<span className="pl-2" onClick={() => {
387+
<span className="ps-2" onClick={() => {
388388
connectToLocalhost()
389389
setShowMain(false)
390390
setOpenSub(null)
391391
}}>
392-
<i className="fas fa-desktop mr-2"></i>
392+
<i className="fas fa-desktop me-2"></i>
393393
Connect to Localhost
394394
</span>
395395
</Dropdown.Item>
@@ -398,12 +398,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
398398
setShowMain(false)
399399
setOpenSub(null)
400400
}}>
401-
<span className="pl-2 text-white" onClick={() => {
401+
<span className="ps-2 text-white" onClick={() => {
402402
deleteAllWorkspaces()
403403
setShowMain(false)
404404
setOpenSub(null)
405405
}}>
406-
<i className="fas fa-trash-can mr-2"></i>
406+
<i className="fas fa-trash-can me-2"></i>
407407
Delete all Workspaces
408408
</span>
409409
</li>

‎libs/remix-ui/top-bar/src/components/WorkspaceDropdownSubMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function WorkspaceDropdownSubMenu ({ menuItems, style }: WorkspaceDropdow
2323
>
2424
<span className="d-flex justify-content-evenly align-items-center">
2525
<i className={item.icon}></i>
26-
<span className="pl-2">{item.label}</span>
26+
<span className="ps-2">{item.label}</span>
2727
</span>
2828
</Dropdown.Item>
2929
)
@@ -41,7 +41,7 @@ export function WorkspaceDropdownSubMenu ({ menuItems, style }: WorkspaceDropdow
4141
>
4242
<span className="d-flex justify-content-evenly align-items-center text-danger">
4343
<i className={item.icon}></i>
44-
<span className="pl-2">{item.label}</span>
44+
<span className="ps-2">{item.label}</span>
4545
</span>
4646
</Dropdown.Item>
4747
]

‎libs/remix-ui/top-bar/src/components/gitLogin.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ export const GitHubLogin: React.FC<GitHubLoginProps> = ({
154154
>
155155
{isLoading ? (
156156
<>
157-
<i className="fas fa-spinner fa-spin mr-1"></i>
157+
<i className="fas fa-spinner fa-spin me-1"></i>
158158
<span>Connecting...</span>
159159
</>
160160
) : (
161161
<div className="d-flex flex-nowrap align-items-center flex-row justify-content-center">
162-
<i className="fab fa-github mr-1"></i>
162+
<i className="fab fa-github me-1"></i>
163163
<span>Login with GitHub</span>
164164
</div>
165165
)}
@@ -175,13 +175,13 @@ export const GitHubLogin: React.FC<GitHubLoginProps> = ({
175175
</Dropdown.Toggle>
176176
<Dropdown.Menu
177177
as={CustomTopbarMenu}
178-
className="custom-dropdown-items w-75 text-decoration-none"
178+
className="custom-dropdown-items w-75 text-decoration-none bg-light"
179179
>
180180
<Dropdown.Item
181181
data-id="github-dropdown-item-clone"
182182
onClick={cloneGitRepository}
183183
>
184-
<i className="fab fa-github mr-2"></i>
184+
<i className="fab fa-github me-2"></i>
185185
<span>Clone</span>
186186
</Dropdown.Item>
187187
<Dropdown.Item
@@ -191,7 +191,7 @@ export const GitHubLogin: React.FC<GitHubLoginProps> = ({
191191
_paq.push(['trackEvent', 'topbar', 'GIT', 'publishToGist'])
192192
}}
193193
>
194-
<i className="fab fa-github mr-2"></i>
194+
<i className="fab fa-github me-2"></i>
195195
<span>Publish to Gist</span>
196196
</Dropdown.Item>
197197
<Dropdown.Divider style={{ pointerEvents: 'none' }} className="border" />
@@ -203,7 +203,7 @@ export const GitHubLogin: React.FC<GitHubLoginProps> = ({
203203
}}
204204
className="text-danger"
205205
>
206-
<i className="fas fa-sign-out-alt mr-2"></i>
206+
<i className="fas fa-sign-out-alt me-2"></i>
207207
<span>Disconnect</span>
208208
</Dropdown.Item>
209209
</Dropdown.Menu>

‎libs/remix-ui/top-bar/src/components/githubLoginSuccess.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default function GithubLoginSuccess ({ user, handleLogout, cloneGitReposi
2727
style={{ fontSize: '0.8rem' }}
2828
>
2929
<span>{user.login}</span>
30-
<img src={user.avatar_url} alt="Avatar" className="ml-1" style={{
30+
<img src={user.avatar_url} alt="Avatar" className="ms-1" style={{
3131
width: '25px',
3232
height: '25px',
3333
borderRadius: '50%',
@@ -52,7 +52,7 @@ export default function GithubLoginSuccess ({ user, handleLogout, cloneGitReposi
5252
data-id="github-dropdown-item-clone"
5353
onClick={cloneGitRepository}
5454
>
55-
<i className="fab fa-github mr-2"></i>
55+
<i className="fab fa-github me-2"></i>
5656
<span>Clone</span>
5757
</Dropdown.Item>
5858
<Dropdown.Item
@@ -62,7 +62,7 @@ export default function GithubLoginSuccess ({ user, handleLogout, cloneGitReposi
6262
_paq.push(['trackEvent', 'topbar', 'GIT', 'publishToGist'])
6363
}}
6464
>
65-
<i className="fab fa-github mr-2"></i>
65+
<i className="fab fa-github me-2"></i>
6666
<span>Publish to Gist</span>
6767
</Dropdown.Item>
6868
<Dropdown.Divider style={{ pointerEvents: 'none' }} className="border" />
@@ -74,7 +74,7 @@ export default function GithubLoginSuccess ({ user, handleLogout, cloneGitReposi
7474
}}
7575
className="text-danger"
7676
>
77-
<i className="fas fa-sign-out-alt mr-2"></i>
77+
<i className="fas fa-sign-out-alt me-2"></i>
7878
<span>Disconnect</span>
7979
</Dropdown.Item>
8080
</Dropdown.Menu>

‎libs/remix-ui/top-bar/src/lib/remix-ui-topbar.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,14 @@ export function RemixUiTopbar () {
344344
>
345345
<span
346346
>
347-
{currentWorkspace === props.mName ? <span>&#10003; {props.mName} </span> : <span className="pl-1">{props.mName}</span>}</span>
347+
{currentWorkspace === props.mName ? <span>&#10003; {props.mName} </span> : <span className="ps-1">{props.mName}</span>}</span>
348348
<i className="fas fa-code-branch pt-1"></i>
349349
</div>
350350
) : (
351351
<div
352352
className="d-flex justify-content-between"
353353
>
354-
<span>{currentWorkspace === props.mName ? <span>&#10003; {props.mName} </span> : <span className="pl-3">{props.mName}</span>}</span>
354+
<span>{currentWorkspace === props.mName ? <span>&#10003; {props.mName} </span> : <span className="ps-3">{props.mName}</span>}</span>
355355
</div>
356356
)}
357357
</>
@@ -395,7 +395,7 @@ export function RemixUiTopbar () {
395395
</Dropdown.Item>
396396
<i
397397
ref={subMenuIconRef}
398-
className="fas fa-ellipsis-vertical pt-1 pr-2 top-bar-dropdownItem"
398+
className="fas fa-ellipsis-vertical pt-1 pe-2 top-bar-dropdownItem"
399399
onClick={() => {
400400
setShowSubMenuFlyOut(!showSubMenuFlyOut)
401401
}}
@@ -433,11 +433,11 @@ export function RemixUiTopbar () {
433433
>
434434
<div className="d-flex flex-row align-items-center justify-content-between w-100">
435435
<div
436-
className="d-flex flex-row align-items-center justify-content-evenly m-1"
436+
className="d-flex flex-row align-items-center m-1"
437437
style={{ minWidth: '33%' }}
438438
>
439439
<div
440-
className="d-flex align-items-center justify-content-between mr-3 cursor-pointer"
440+
className="d-flex align-items-center justify-content-between me-3 cursor-pointer"
441441
onClick={async () => {
442442
await plugin.call('tabs', 'focus', 'home')
443443
_paq.push(['trackEvent', 'topbar', 'header', 'Home'])
@@ -456,7 +456,7 @@ export function RemixUiTopbar () {
456456
<BasicLogo />
457457
</div>
458458
<div
459-
className="text-primary ml-2 font-weight-light text-uppercase cursor-pointer"
459+
className="text-primary ms-2 font-weight-light text-uppercase cursor-pointer"
460460
style={{ fontSize: '1.2rem' }}
461461
onClick={async () => {
462462
await plugin.call('tabs', 'focus', 'home')
@@ -525,11 +525,11 @@ export function RemixUiTopbar () {
525525
/>
526526
)}
527527
</>
528-
<Dropdown className="ml-5" data-id="topbar-themeIcon" show={showTheme} ref={themeIconRef}>
528+
<Dropdown className="ms-5" data-id="topbar-themeIcon" show={showTheme} ref={themeIconRef}>
529529
<Dropdown.Toggle
530530
as={Button}
531531
variant="outline-secondary"
532-
className="btn-topbar btn-sm mr-5"
532+
className="btn-topbar btn-sm me-5"
533533
data-id="topbar-themeIcon-toggle"
534534
style={{
535535
padding: '0.35rem 0.5rem',
@@ -543,7 +543,7 @@ export function RemixUiTopbar () {
543543
>
544544
<i
545545
className={
546-
`fas ${currentTheme && currentTheme.name.includes('Dark') ? 'fa-moon' : 'fa-sun-bright text-white'} mr-2`
546+
`fas ${currentTheme && currentTheme.name.includes('Dark') ? 'fa-moon' : 'fa-sun-bright text-white'} me-2`
547547
}
548548
onClick={() => {
549549
setShowTheme(!showTheme)
@@ -553,7 +553,7 @@ export function RemixUiTopbar () {
553553
</Dropdown.Toggle>
554554
<Dropdown.Menu
555555
as={CustomTopbarMenu}
556-
className="custom-dropdown-items text-decoration-none"
556+
className="custom-dropdown-items text-decoration-none bg-light"
557557
data-id="topbar-thememenu-body"
558558
style={{
559559
minWidth: '95px'
@@ -565,7 +565,7 @@ export function RemixUiTopbar () {
565565
}}
566566
data-id="topbar-themeIcon-light"
567567
>
568-
<i className="fas fa-sun-bright mr-2"></i>
568+
<i className="fas fa-sun-bright me-2"></i>
569569
Light
570570
</Dropdown.Item>
571571
<Dropdown.Item
@@ -574,7 +574,7 @@ export function RemixUiTopbar () {
574574
}}
575575
data-id="topbar-themeIcon-dark"
576576
>
577-
<i className="fas fa-moon mr-2"></i>
577+
<i className="fas fa-moon me-2"></i>
578578
Dark
579579
</Dropdown.Item>
580580
</Dropdown.Menu>

0 commit comments

Comments
 (0)