Skip to content

Commit 6ef284f

Browse files
githubsaturngithubsaturn
committed
Fixed RTL
1 parent 51e881c commit 6ef284f

17 files changed

+70
-54
lines changed

‎src/containers/PageRoot.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -150,24 +150,24 @@ class PageRoot extends ApiComponent<
150150
>
151151
<GiftTwoTone
152152
style={{
153-
marginLeft: 50,
153+
marginInlineStart: 50,
154154
}}
155155
/>
156156
<GiftTwoTone
157157
style={{
158-
marginRight: 10,
159-
marginLeft: 3,
158+
marginInlineEnd: 10,
159+
marginInlineStart: 3,
160160
}}
161161
/>
162162
Update Available!
163163
<GiftTwoTone
164164
style={{
165-
marginLeft: 10,
165+
marginInlineStart: 10,
166166
}}
167167
/>
168168
<GiftTwoTone
169169
style={{
170-
marginLeft: 3,
170+
marginInlineStart: 3,
171171
}}
172172
/>
173173
</ClickableLink>
@@ -211,7 +211,7 @@ class PageRoot extends ApiComponent<
211211
src="/icon-512x512.png"
212212
style={{
213213
height: 45,
214-
marginRight: 10,
214+
marginInlineEnd: 10,
215215
}}
216216
/>
217217
<h3 style={{ color: '#fff', margin: 0 }}>
@@ -225,7 +225,7 @@ class PageRoot extends ApiComponent<
225225
<Col span={12}>
226226
<Row justify="end">
227227
<NewTabLink url="https://github.com/caprover/caprover">
228-
<span style={{ marginRight: 20 }}>
228+
<span style={{ marginInlineEnd: 20 }}>
229229
{localize(
230230
'page_root.github_link',
231231
'Github'
@@ -235,7 +235,7 @@ class PageRoot extends ApiComponent<
235235

236236
<span
237237
style={{
238-
marginRight: 30,
238+
marginInlineEnd: 30,
239239
}}
240240
>
241241
<NewTabLink url="https://caprover.com">
@@ -247,7 +247,7 @@ class PageRoot extends ApiComponent<
247247
</span>
248248
<span
249249
style={{
250-
marginRight: 50,
250+
marginInlineEnd: 50,
251251
}}
252252
>
253253
<DarkModeSwitch />
@@ -369,7 +369,7 @@ class PageRoot extends ApiComponent<
369369
paddingBottom: 36,
370370
height: '100%',
371371
overflowY: 'scroll',
372-
marginRight: self.state.collapsed
372+
marginInlineEnd: self.state.collapsed
373373
? 0
374374
: self.props.isMobile
375375
? -200

‎src/containers/apps/AppsTable.tsx

+24-12
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class AppsTable extends Component<
188188
<LoadingOutlined
189189
style={{
190190
fontSize: '12px',
191-
marginLeft: 12,
191+
marginInlineStart: 12,
192192
}}
193193
/>
194194
) : undefined}
@@ -399,7 +399,10 @@ class AppsTable extends Component<
399399
<div style={{ maxWidth: 250 }}>
400400
<CodeOutlined />
401401
<span
402-
style={{ marginRight: 20, marginLeft: 5 }}
402+
style={{
403+
marginInlineEnd: 20,
404+
marginInlineStart: 5,
405+
}}
403406
>
404407
{localize('apps_table.title', 'Your Apps')}
405408
</span>
@@ -492,7 +495,7 @@ class AppsTable extends Component<
492495
}}
493496
>
494497
<Splitter.Panel
495-
style={{ marginRight: 10 }}
498+
style={{ marginInlineEnd: 10 }}
496499
defaultSize={`${Math.floor(
497500
StorageHelper.getAppProjectSplitRatioFromLocalStorage() *
498501
100
@@ -502,7 +505,9 @@ class AppsTable extends Component<
502505
>
503506
{self.createProjectTreeView()}
504507
</Splitter.Panel>
505-
<Splitter.Panel style={{ marginLeft: 10 }}>
508+
<Splitter.Panel
509+
style={{ marginInlineStart: 10 }}
510+
>
506511
{self.createAppTableHeader()}
507512
<Table<TableData>
508513
rowKey="appName"
@@ -561,7 +566,12 @@ class AppsTable extends Component<
561566
if (!selectedProject || !selectedProject.description) return <div />
562567

563568
return (
564-
<DescriptionPanel headerText="Notes">
569+
<DescriptionPanel
570+
headerText={localize(
571+
'projects.edit_project_description',
572+
'Description'
573+
)}
574+
>
565575
<div
566576
style={{
567577
whiteSpace: 'pre-wrap',
@@ -626,8 +636,8 @@ class AppsTable extends Component<
626636
<>
627637
<span
628638
style={{
629-
marginLeft: 5,
630-
marginRight: 5,
639+
marginInlineStart: 5,
640+
marginInlineEnd: 5,
631641
}}
632642
>
633643
{name}
@@ -760,11 +770,13 @@ class AppsTable extends Component<
760770
justify={'space-between'}
761771
align={'middle'}
762772
style={{
763-
marginLeft: -18,
773+
marginInlineStart: -18,
764774
marginTop: -10,
765775
}}
766776
>
767-
<h4 style={{ margin: 0 }}>Projects</h4>
777+
<h4 style={{ margin: 0 }}>
778+
{localize('apps.delete_app_projects_list', 'Projects')}
779+
</h4>
768780
<Tooltip
769781
title={localize(
770782
'projects.new_project',
@@ -784,13 +796,13 @@ class AppsTable extends Component<
784796
</Row>
785797
<hr
786798
style={{
787-
marginLeft: -18,
799+
marginInlineStart: -18,
788800
marginBottom: 20,
789-
marginRight: 0,
801+
marginInlineEnd: 0,
790802
}}
791803
/>
792804
<Tree.DirectoryTree
793-
style={{ marginLeft: -22, position: 'absolute' }}
805+
style={{ marginInlineStart: -22, position: 'absolute' }}
794806
showLine
795807
checkStrictly={true}
796808
showIcon={false}

‎src/containers/apps/CreateNewApp.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ class CreateNewApp extends Component<
106106
style={{
107107
marginTop: 32,
108108
marginBottom: 5,
109-
marginLeft: 5,
110109
}}
111110
>
112111
{localize('apps.parent_project', 'Parent project')}

‎src/containers/apps/DescriptionPanel.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class DescriptionPanel extends Component<DescriptionPanelProps> {
1717
position: 'absolute',
1818
paddingBottom: 0,
1919
marginTop: -40,
20-
marginLeft: -15,
20+
marginInlineStart: -15,
2121
}}
2222
>
2323
<Card

‎src/containers/apps/EditableSpan.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class EditableSpan extends React.Component<EditableSpanProps> {
4040
position: 'relative',
4141
display: 'inline-block',
4242
cursor: 'pointer',
43-
paddingRight: 20,
43+
paddingInlineEnd: 20,
4444
}}
4545
onClick={onEditClick}
4646
onMouseEnter={this.handleMouseEnter}
@@ -50,7 +50,7 @@ class EditableSpan extends React.Component<EditableSpanProps> {
5050
<span
5151
className={this.className}
5252
style={{
53-
marginLeft: 10,
53+
marginInlineStart: 5,
5454
opacity: 0,
5555
transition: 'opacity 0.3s',
5656
}}

‎src/containers/apps/ProjectDetailsEdit.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ class ProjectDetailsEdit extends ApiComponent<
109109
style={{
110110
marginTop: 32,
111111
marginBottom: 5,
112-
marginLeft: 5,
113112
}}
114113
>
115114
{localize(
@@ -136,7 +135,6 @@ class ProjectDetailsEdit extends ApiComponent<
136135
style={{
137136
marginTop: 32,
138137
marginBottom: 5,
139-
marginLeft: 5,
140138
}}
141139
>
142140
{localize(
@@ -162,7 +160,7 @@ class ProjectDetailsEdit extends ApiComponent<
162160
/>
163161
<Row style={{ marginTop: 48 }} justify="end">
164162
<Button
165-
style={{ marginRight: 20 }}
163+
style={{ marginInlineEnd: 20 }}
166164
onClick={() => self.goBackToApps()}
167165
>
168166
{localize(

‎src/containers/apps/appDetails/AppConfigs.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ export default class AppConfigs extends Component<
711711
</h4>
712712
<div style={{ marginTop: 10 }}>
713713
<span
714-
style={{ marginRight: 20 }}
714+
style={{ marginInlineEnd: 10 }}
715715
onClick={() => {
716716
self.setState({
717717
tagsEditMode: !self.state.tagsEditMode,

‎src/containers/apps/appDetails/AppDetails.tsx

+11-8
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ class AppDetails extends ApiComponent<
159159
<div style={{ marginBottom: 10, fontSize: 12 }}>
160160
<FolderOpenOutlined
161161
style={{
162-
marginRight: 5,
162+
marginInlineEnd: 5,
163163
}}
164164
/>
165165
{projectsBreadCrumbs.map((project, index) => (
166166
<>
167167
<span
168168
style={{
169-
marginLeft: 5,
170-
marginRight: 5,
169+
marginInlineStart: 5,
170+
marginInlineEnd: 5,
171171
}}
172172
key={project.id}
173173
>
@@ -211,7 +211,12 @@ class AppDetails extends ApiComponent<
211211
</div>
212212
<div>{self.createProjectBreadcrumbs()}</div>
213213

214-
<h2 style={{ marginBottom: 5, marginTop: 0, marginLeft: 12 }}>
214+
<h2
215+
style={{
216+
marginBottom: 5,
217+
marginTop: 0,
218+
}}
219+
>
215220
<EditableSpan
216221
onEditClick={() => {
217222
self.setState({
@@ -231,7 +236,7 @@ class AppDetails extends ApiComponent<
231236
</h2>
232237

233238
{app.tags && app.tags.length > 0 && (
234-
<span style={{ marginLeft: 12 }}>
239+
<span>
235240
{app.tags.map((tag, index) => (
236241
<Tag key={index}>{tag.tagName}</Tag>
237242
))}
@@ -252,7 +257,7 @@ class AppDetails extends ApiComponent<
252257
if (!app.description) return <div />
253258

254259
return (
255-
<div style={{ marginLeft: 16, marginTop: 28 }}>
260+
<div style={{ marginTop: 28 }}>
256261
<Typography.Paragraph
257262
style={{
258263
fontSize: 14,
@@ -637,7 +642,6 @@ class AppDetails extends ApiComponent<
637642
style={{
638643
marginTop: 32,
639644
marginBottom: 5,
640-
marginLeft: 5,
641645
}}
642646
>
643647
{localize('apps.parent_project', 'Parent project')}
@@ -661,7 +665,6 @@ class AppDetails extends ApiComponent<
661665
style={{
662666
marginTop: 32,
663667
marginBottom: 5,
664-
marginLeft: 5,
665668
}}
666669
>
667670
{localize('apps.app_edit_description', 'Description')}

‎src/containers/apps/appDetails/HttpSettings.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export default class HttpSettings extends Component<
171171
return (
172172
<Fragment>
173173
<Row>
174-
<span style={{ marginRight: 10 }}>
174+
<span style={{ marginInlineEnd: 10 }}>
175175
Redirect all domains to:
176176
</span>
177177

@@ -224,7 +224,7 @@ export default class HttpSettings extends Component<
224224
</Button>
225225
</Tooltip>
226226
<Button
227-
style={{ marginRight: 20 }}
227+
style={{ marginInlineEnd: 20 }}
228228
onClick={() => {
229229
this.onRemoveCustomDomainClicked(c.publicDomain)
230230
}}
@@ -361,7 +361,7 @@ export default class HttpSettings extends Component<
361361
>
362362
<span
363363
style={{
364-
marginLeft: 20,
364+
marginInlineStart: 20,
365365
}}
366366
>
367367
{`http${app.hasDefaultSubDomainSsl ? 's' : ''}://${
@@ -535,7 +535,7 @@ export default class HttpSettings extends Component<
535535
<br />
536536
<Row>
537537
<Button
538-
style={{ marginRight: 20 }}
538+
style={{ marginInlineEnd: 20 }}
539539
type="default"
540540
onClick={() => self.onEditHttpAuthClicked()}
541541
>

‎src/containers/apps/appDetails/deploy/AppLogsView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export default class AppLogsView extends ApiComponent<
212212

213213
<span
214214
style={{
215-
marginLeft: 20,
215+
marginInlineStart: 10,
216216
}}
217217
>
218218
<NewTabLink url="https://caprover.com/docs/troubleshooting.html#how-to-view-my-applications-log">

‎src/containers/apps/appDetails/deploy/Deployment.tsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ export default class Deployment extends ApiComponent<
375375
>
376376
<Button
377377
disabled={!hasPushToken}
378-
style={{ marginRight: this.props.isMobile ? 0 : 10 }}
378+
style={{
379+
marginInlineEnd: this.props.isMobile ? 0 : 10,
380+
}}
379381
block={this.props.isMobile}
380382
onClick={() => {
381383
self.apiManager
@@ -486,7 +488,7 @@ export default class Deployment extends ApiComponent<
486488
<Col xs={{ span: 24 }} lg={{ span: 12 }}>
487489
<div
488490
style={{
489-
paddingLeft: this.props.isMobile ? 0 : 24,
491+
marginInlineStart: this.props.isMobile ? 0 : 24,
490492
marginTop: this.props.isMobile ? 8 : 0,
491493
}}
492494
>
@@ -518,7 +520,9 @@ export default class Deployment extends ApiComponent<
518520
</Tooltip>
519521
<Button
520522
style={{
521-
marginLeft: this.props.isMobile ? 0 : 20,
523+
marginInlineStart: this.props.isMobile
524+
? 0
525+
: 20,
522526
marginTop: this.props.isMobile ? 8 : 0,
523527
}}
524528
block={this.props.isMobile}

0 commit comments

Comments
 (0)