Skip to content

Commit 03e577c

Browse files
committed
fix: fix styling for recommended challenge and thrive articles
#3977
1 parent eac082e commit 03e577c

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

src/shared/components/challenge-detail/RecommendedActiveChallenges/ChallengesCard/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export default function ChallengesCard({
8181
onClick={() => selectChallengeDetailsTab(DETAIL_TABS.DETAILS)}
8282
to={challengeDetailLink}
8383
styleName="challenge-title"
84-
openNewTab={false}
84+
openNewTab
8585
><p>{challenge.name}</p>
8686
</Link>
8787
<div styleName="endtime-prize-container">

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
align-items: center;
1919
justify-content: space-between;
2020
margin-top: -20px;
21-
padding: 0 13px 0 33px;
21+
padding: 0 13px;
2222
flex-wrap: wrap;
2323
}
2424

@@ -39,7 +39,6 @@
3939
.challenges {
4040
display: flex;
4141
flex-wrap: wrap;
42-
justify-content: center;
4342
}
4443

4544
.challenge-card {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
.header {
2424
@include roboto-bold;
2525

26-
margin-left: 33px;
26+
margin-left: 13px;
2727
font-size: 20px;
2828
color: $tc-black;
2929
}

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

+5-9
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,8 @@ class ChallengeDetailPageContainer extends React.Component {
414414
registerForChallenge={this.registerForChallenge}
415415
registering={registering}
416416
selectedView={selectedTab}
417-
hasRecommendedChallenges={
418-
selectedTab === DETAIL_TABS.DETAILS && displayRecommendedChallenges.length > 0
419-
}
420-
hasThriveArticles={
421-
selectedTab === DETAIL_TABS.DETAILS && (thriveArticles.length > 0)}
417+
hasRecommendedChallenges={displayRecommendedChallenges.length > 0}
418+
hasThriveArticles={thriveArticles.length > 0}
422419
setChallengeListingFilter={setChallengeListingFilter}
423420
unregisterFromChallenge={() => unregisterFromChallenge(auth, challengeId)
424421
}
@@ -528,8 +525,7 @@ class ChallengeDetailPageContainer extends React.Component {
528525
}}
529526
/>
530527
{
531-
!isEmpty && selectedTab === DETAIL_TABS.DETAILS
532-
&& displayRecommendedChallenges.length ? (
528+
!isEmpty && displayRecommendedChallenges.length ? (
533529
<RecommendedActiveChallenges
534530
challenges={displayRecommendedChallenges}
535531
prizeMode={prizeMode}
@@ -539,10 +535,10 @@ class ChallengeDetailPageContainer extends React.Component {
539535
expandedTags={expandedTags}
540536
expandTag={expandTag}
541537
/>
542-
) : null
538+
) : null
543539
}
544540
{
545-
!isEmpty && selectedTab === DETAIL_TABS.DETAILS && thriveArticles.length ? (
541+
!isEmpty && thriveArticles.length ? (
546542
<RecommendedThriveArticles articles={thriveArticles} />
547543
) : null
548544
}

src/shared/utils/challenge-detail/helper.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export function getDisplayRecommendedChallenges(
195195
let results = _.filter(displayRecommendedChallenges, (c) => {
196196
let isValid = filter(c);
197197
if (isValid && userHandle) {
198-
isValid = !c.users[userHandle];
198+
isValid = !c.users[userHandle] && c.id !== challenge.id;
199199
}
200200
return isValid;
201201
});

0 commit comments

Comments
 (0)