Skip to content

Commit 7191f73

Browse files
committed
fix: buttons design system
1 parent 3d16d70 commit 7191f73

File tree

3 files changed

+44
-17
lines changed

3 files changed

+44
-17
lines changed

src/shared/components/ProfilePage/Awards/AwardBadge/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const AwardBadge = ({
1717
}
1818
<div styleName="title">
1919
<span>
20+
{/* eslint-disable-next-line react/no-danger */}
2021
<div dangerouslySetInnerHTML={{ __html: title }} />
2122
</span>
2223
</div>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -423,16 +423,16 @@ export default function ChallengeHeader(props) {
423423
Submit
424424
</PrimaryButton>
425425
{
426-
track === COMPETITION_TRACKS.DES && hasRegistered && !unregistering
426+
track === COMPETITION_TRACKS.DES && hasRegistered && !unregistering
427427
&& hasSubmissions && (
428-
<PrimaryButton
429-
theme={{ button: style.submitButton }}
430-
to={`${challengesUrl}/${challengeId}/my-submissions`}
431-
>
432-
View Submissions
433-
</PrimaryButton>
434-
)
435-
}
428+
<PrimaryButton
429+
theme={{ button: style.submitButton }}
430+
to={`${challengesUrl}/${challengeId}/my-submissions`}
431+
>
432+
View Submissions
433+
</PrimaryButton>
434+
)
435+
}
436436
</div>
437437
</div>
438438
</div>

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

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
.submitButton {
1414
margin: $base-unit 0;
1515
min-width: 0;
16-
width: 100%;
16+
border-width: 2px !important;
1717
border-radius: 50px !important;
1818
height: 48px;
1919
background: #137d60 !important;
2020
color: #fff !important;
2121
white-space: nowrap;
22-
padding: 0 35px !important;
22+
padding: 12 24px !important;
2323

2424
@include xs-to-sm {
2525
width: fit-content;
@@ -29,10 +29,10 @@
2929
.submitButtonDisabled {
3030
margin: $base-unit 0;
3131
min-width: 0;
32-
width: 100%;
32+
border-width: 2px !important;
3333
border-radius: 50px !important;
3434
height: 48px;
35-
padding: 0 25px !important;
35+
padding: 12 24px !important;
3636
color: #767676 !important;
3737
background: #f4f4f4 !important;
3838

@@ -44,10 +44,10 @@
4444
.unregisterButton {
4545
margin: $base-unit 0;
4646
min-width: 0;
47-
width: 100%;
47+
border-width: 2px !important;
4848
border-radius: 50px !important;
4949
height: 48px;
50-
padding: 0 25px !important;
50+
padding: 12 24px !important;
5151
color: #137d60 !important;
5252
border-color: #137d60 !important;
5353
background: #fff !important;
@@ -60,17 +60,43 @@
6060
.registerBtn {
6161
margin: $base-unit 0;
6262
min-width: 0;
63-
width: 100%;
63+
border-width: 2px !important;
6464
border-radius: 50px !important;
6565
height: 48px;
66-
padding: 0 25px !important;
66+
padding: 12 24px !important;
6767
background-color: #137d60 !important;
6868

6969
@include xs-to-sm {
7070
width: fit-content;
7171
}
7272
}
7373

74+
.submitButton:hover,
75+
.registerBtn:hover {
76+
color: #fff !important;
77+
border-color: #219174 !important;
78+
background: #219174 !important;
79+
}
80+
81+
.unregisterButton:hover {
82+
color: #219174 !important;
83+
border-color: #219174 !important;
84+
background: #fff !important;
85+
}
86+
87+
.submitButton:active,
88+
.registerBtn:active {
89+
color: #fff !important;
90+
border-color: #0d664e !important;
91+
background: #0d664e !important;
92+
}
93+
94+
.unregisterButton:active {
95+
color: #0d664e !important;
96+
border-color: #0d664e !important;
97+
background: #fff !important;
98+
}
99+
74100
.challenge-ops-container {
75101
display: flex;
76102
margin-top: 32px;

0 commit comments

Comments
 (0)