Skip to content

Commit a6c2138

Browse files
committed
improvement(reskin): mm swap toggle view
1 parent 41a5f7a commit a6c2138

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed

src/shared/components/challenge-detail/Submissions/SubmissionRow/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
flex-direction: column;
9595
border-top: 1px solid #e9e9e9;
9696
border-bottom: 0;
97-
margin-left: 16px;
97+
margin-left: 0;
9898
margin-top: 25px;
99-
margin-right: 34px;
99+
margin-right: 15px;
100100
}
101101

102102
&.no-border {

src/shared/components/challenge-detail/Submissions/index.jsx

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -445,22 +445,26 @@ class SubmissionsComponent extends React.Component {
445445

446446
return (
447447
<div styleName={`container dev ${isMM ? 'mm' : 'non-mm'}`}>
448-
<div styleName="view-as">
449-
<span styleName="title">View as</span>
450-
{
451-
viewAsTable ? (
452-
<React.Fragment>
453-
<ViewAsTableActive styleName="table-icon" onClick={() => setViewAsTable(true)} />
454-
<ViewAsListInactive styleName="list-icon" onClick={() => setViewAsTable(false)} />
455-
</React.Fragment>
456-
) : (
457-
<React.Fragment>
458-
<ViewAsTableInactive styleName="table-icon" onClick={() => setViewAsTable(true)} />
459-
<ViewAsListActive styleName="list-icon" onClick={() => setViewAsTable(false)} />
460-
</React.Fragment>
461-
)
462-
}
463-
</div>
448+
{
449+
isMM ? (
450+
<div styleName="view-as">
451+
<span styleName="title">View as</span>
452+
{
453+
viewAsTable ? (
454+
<React.Fragment>
455+
<ViewAsListInactive styleName="list-icon" onClick={() => setViewAsTable(false)} />
456+
<ViewAsTableActive styleName="table-icon" onClick={() => setViewAsTable(true)} />
457+
</React.Fragment>
458+
) : (
459+
<React.Fragment>
460+
<ViewAsListActive styleName="list-icon" onClick={() => setViewAsTable(false)} />
461+
<ViewAsTableInactive styleName="table-icon" onClick={() => setViewAsTable(true)} />
462+
</React.Fragment>
463+
)
464+
}
465+
</div>
466+
) : null
467+
}
464468
<div styleName={`${viewAsTable ? 'view-as-table' : ''}`}>
465469
{
466470
!isMM && (

src/shared/components/challenge-detail/Submissions/style.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348

349349
@include xs-to-sm {
350350
flex-direction: column;
351-
margin: 0 16px;
351+
margin: 0 16px 0 0;
352352
border-top: 1px solid #e9e9e9;
353353
}
354354
}
@@ -600,15 +600,16 @@
600600
}
601601

602602
.table-icon {
603-
margin-right: 10px;
603+
margin-right: 15px;
604604
}
605605

606606
.list-icon {
607-
margin-right: 15px;
607+
margin-right: 10px;
608608
}
609609
}
610610

611611
.view-as-table {
612612
overflow-y: scroll;
613613
margin-top: 20px;
614+
margin-right: 15px;
614615
}

src/shared/containers/challenge-detail/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ class ChallengeDetailPageContainer extends React.Component {
483483
submissionEnded={submissionEnded}
484484
mySubmissions={challenge.isRegistered ? mySubmissions : []}
485485
openForRegistrationChallenges={openForRegistrationChallenges}
486-
viewAsTable={viewAsTable}
486+
viewAsTable={viewAsTable && isMM}
487487
onSort={(currenctSelected, sort) => {
488488
if (currenctSelected === 'submissions') {
489489
this.setState({ submissionsSort: sort });
@@ -571,7 +571,7 @@ class ChallengeDetailPageContainer extends React.Component {
571571
isLegacyMM={isLegacyMM}
572572
submissionEnded={submissionEnded}
573573
challengesUrl={challengesUrl}
574-
viewAsTable={viewAsTable}
574+
viewAsTable={viewAsTable && isMM}
575575
setViewAsTable={value => this.setState({ viewAsTable: value })}
576576
/>
577577
)

0 commit comments

Comments
 (0)