Skip to content

Commit 1607e0f

Browse files
authored
Merge pull request #12882 from nanaya/medal-layout
Single column layout for user medals section
2 parents 8e44fdd + a42bf5d commit 1607e0f

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

resources/css/bem/badge-achievement.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
&--listing {
2020
width: 70px;
21-
margin: auto;
2221
}
2322

2423
&--recent {

resources/css/bem/medals-group.less

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,19 @@
66
gap: 20px;
77

88
@media @desktop {
9-
grid-template-columns: 1fr 1fr;
109
gap: 40px;
1110
}
1211

1312
&__group {
1413
.default-border-radius();
15-
display: inline-flex;
16-
flex-direction: column;
14+
display: grid;
15+
gap: 10px;
1716
}
1817

19-
&__medal {
20-
min-width: (10px + 70px);
21-
height: 76px;
22-
width: 25%;
23-
margin: 10px 0;
24-
display: inline-block;
18+
&__medals {
19+
display: flex;
20+
flex-wrap: wrap;
21+
gap: 10px 20px;
2522
}
2623

2724
&__title {

resources/js/profile-page/medals.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,12 @@ export default class Medals extends React.Component<ExtraPageProps> {
115115
{[...groupedAchievements.entries()].map(([ordering, orderedAchievements]) => (
116116
<div key={ordering} className='medals-group__medals'>
117117
{orderedAchievements.map((ua) => (
118-
<div key={ua.achievement.id} className='medals-group__medal'>
119-
<AchievementBadge
120-
achievedAt={ua.userAchievement?.achieved_at}
121-
achievement={ua.achievement}
122-
modifiers='listing'
123-
/>
124-
</div>
118+
<AchievementBadge
119+
key={ua.achievement.id}
120+
achievedAt={ua.userAchievement?.achieved_at}
121+
achievement={ua.achievement}
122+
modifiers='listing'
123+
/>
125124
))}
126125
</div>
127126
))}

0 commit comments

Comments
 (0)