Skip to content

Commit 72c56f7

Browse files
authored
Merge pull request #6334 from nursoltan-s/additional-fixes
additional fixes from challenge listing reskin
2 parents c73f179 + fa3806b commit 72c56f7

File tree

9 files changed

+42
-20
lines changed

9 files changed

+42
-20
lines changed

src/shared/components/DateRangePicker/DateInput/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
input {
1111
padding: 5px;
12-
height: 30px !important;
12+
height: 40px !important;
1313
font-size: 13px !important;
1414
line-height: 16px !important;
1515
margin-bottom: 0 !important;
@@ -43,5 +43,5 @@
4343
position: absolute;
4444
cursor: pointer;
4545
margin-left: -22px;
46-
margin-top: 6px;
46+
margin-top: 11px;
4747
}

src/shared/components/SortingSelectBar/style.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ $down-arrow-size: $base-unit;
196196
display: block;
197197
padding: 8px 20px;
198198
z-index: 100000;
199+
border-bottom: 1px solid #aaa;
200+
border-left: 1px solid #aaa;
201+
border-right: 1px solid #aaa;
199202
}
200203

201204
.Select-option:last-child {

src/shared/components/SwitchWithLabel/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function SwitchWithLabel({
3535
switch: theme.switch,
3636
}}
3737
/>
38-
{labelAfter}
38+
<span>{labelAfter}</span>
3939
</div>
4040
);
4141
}

src/shared/components/Tooltip/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}
99

1010
.rc-tooltip-inner {
11-
border-radius: 3px;
11+
border-radius: 8px;
1212
background: $tc-gray-80;
1313
padding: 0;
1414
}

src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.link:hover {
9-
color: $tc-dark-blue-110;
9+
color: $tc-black;
1010
}
1111

1212
.number {

src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ export default function FiltersPanel({
510510
onSwitch={(e) => {
511511
let { types } = filterState;
512512

513-
if (e.target.checked) {
513+
if (e) {
514514
types = types.concat(option.value);
515515
} else {
516516
types = types.filter(type => type !== option.value);

src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,10 @@ hr.hr {
339339
width: 130px;
340340
}
341341

342+
@include md-to-lg {
343+
width: 26%;
344+
}
345+
342346
.radio-label {
343347
display: inline-block;
344348
padding-left: 24px;
@@ -362,6 +366,7 @@ hr.hr {
362366
border: 1px solid #aaa;
363367
border-radius: 50%;
364368
box-shadow: 0 1px 2px 0 rgba($tc-black, 0.29);
369+
background: #fff;
365370
}
366371

367372
&::after {
@@ -585,12 +590,17 @@ hr.hr {
585590
.Select.is-focused > .Select-control {
586591
outline: none;
587592
box-shadow: none;
588-
border-color: #137d60 !important;
593+
border-color: #151516 !important;
589594
}
590595

591596
.Select-menu-outer {
592597
margin-top: 1px;
593598
font-size: 14px;
599+
600+
.Select-option.is-selected {
601+
background-color: #137d60 !important;
602+
color: $tc-white !important;
603+
}
594604
}
595605
}
596606
}
@@ -611,7 +621,7 @@ hr.hr {
611621

612622
.recommended-challenge-tooltip {
613623
position: absolute;
614-
right: 54px;
624+
left: 210px;
615625
display: flex;
616626
flex-direction: column;
617627
justify-content: center;
@@ -625,9 +635,9 @@ hr.hr {
625635
}
626636

627637
.tctooltiptext {
628-
background: $tc-white;
629-
color: $tc-gray-90;
630-
border-radius: 3px;
638+
background: $tc-black;
639+
color: $tc-white;
640+
border-radius: 8px;
631641
padding: 10px;
632642
}
633643

@@ -642,6 +652,6 @@ hr.hr {
642652
margin-left: -5px;
643653
border-width: 5px 5px 0;
644654
left: 50%;
645-
border-top-color: $tc-white;
655+
border-top-color: $tc-black;
646656
z-index: 1000;
647657
}

src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/style.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ div.progress-bar-tooltip {
1818

1919
.rc-tooltip-inner {
2020
padding: 0 $base-unit * 3;
21+
border-radius: 8px;
2122
}
2223

2324
.tip {

src/shared/components/challenge-listing/style.scss

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,6 @@ $challenge-radius-4: $corner-radius * 2;
131131
}
132132
}
133133

134-
.recommended-plus-tag {
135-
margin-left: 3px;
136-
display: inline-block;
137-
background-color: $tc-white;
138-
}
139-
140134
.tag {
141135
button {
142136
border-radius: 2px;
@@ -146,13 +140,23 @@ $challenge-radius-4: $corner-radius * 2;
146140
font-weight: 500;
147141

148142
&:hover {
149-
background-color: #d4d4d4;
143+
background-color: #d4d4d4 !important;
150144
}
151145
}
152146
}
153147

148+
.recommended-plus-tag {
149+
margin-left: 3px;
150+
display: inline-block;
151+
background-color: $tc-white;
152+
153+
button:hover {
154+
background-color: #d4d4d4 !important;
155+
}
156+
}
157+
154158
.additionalTagWrapper {
155-
background: $tc-white;
159+
background: $tc-black;
156160
display: inline-block;
157161
border-radius: 2px;
158162
padding: 3px 4px;
@@ -181,6 +185,10 @@ $challenge-radius-4: $corner-radius * 2;
181185
margin-top: 5px;
182186
margin-left: 3px;
183187
display: inline-block;
188+
189+
& > button:hover {
190+
background-color: #d4d4d4 !important;
191+
}
184192
}
185193

186194
.tagContainer {

0 commit comments

Comments
 (0)