Skip to content

Commit 492ad96

Browse files
authored
Merge pull request #6332 from nursoltan-s/challenge-listing-feedback
fix feedback issues
2 parents be7f720 + db67a7e commit 492ad96

File tree

16 files changed

+107
-91
lines changed

16 files changed

+107
-91
lines changed

src/assets/images/icon-circle.png

-393 Bytes
Binary file not shown.

src/assets/images/icon-circle.svg

Lines changed: 3 additions & 0 deletions
Loading

src/shared/components/DateRangePicker/index.jsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,13 @@ function DateRangePicker(props) {
246246
setPreview({
247247
startDate: date,
248248
endDate: range.endDate || date,
249+
color: '#137d60',
249250
});
250251
} else if (isEndDateFocused && date) {
251252
setPreview({
252253
startDate: range.startDate || date,
253254
endDate: date,
255+
color: '#137d60',
254256
});
255257
}
256258

@@ -368,21 +370,21 @@ function DateRangePicker(props) {
368370
{
369371
...range,
370372
key: 'selection',
371-
color: '#0B71E6',
373+
color: '#137d60',
372374
},
373375
{
374376
startDate: activeDate,
375377
endDate: activeDate,
376378
key: 'active',
377-
color: '#59A7FF',
379+
color: '#137d60',
378380
},
379381
];
380382
}
381383
return [
382384
{
383385
...range,
384386
key: 'selection',
385-
color: '#0A81FF',
387+
color: '#137d60',
386388
},
387389
];
388390
};
@@ -453,6 +455,8 @@ function DateRangePicker(props) {
453455
shownDate={getShownDate()}
454456
preview={preview}
455457
onPreviewChange={onPreviewChange}
458+
rangeColors={'#137d60'}
459+
color='#137d60'
456460
/>
457461
<button
458462
type="button"

src/shared/components/DateRangePicker/style.scss

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,20 @@
2121

2222
.isRange {
2323
:global {
24+
.rdrStartEdge, .rdrEndEdge {
25+
color: $listing-checkbox-green !important;
26+
}
27+
.rdrDayHovered {
28+
background: $listing-checkbox-green !important;
29+
}
2430
.rdrDay {
25-
.rdrStartEdge,
26-
.rdrEndEdge {
27-
background: $listing-checkbox-green !important;
31+
.rdrInRange {
32+
background: lighten($listing-checkbox-green, 30%) !important;
2833
}
2934

30-
.rdrInRange {
31-
background: $listing-checkbox-green !important;
35+
.rdrStartEdge,
36+
.rdrEndEdge {
37+
background: lighten($listing-checkbox-green, 30%) !important;
3238
}
3339
}
3440
}
@@ -114,10 +120,6 @@
114120
}
115121
}
116122

117-
.rdrMonthAndYearPickers select {
118-
background: url("data:image/svg+xml;utf8,<svg width='9px' height='6px' viewBox='0 0 9 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><g id='Artboard' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd' transform='translate(-636.000000, -171.000000)'><g id='input' transform='translate(172.000000, 37.000000)' fill='%230B71E6' fill-rule='nonzero'><g id='Group-9' transform='translate(323.000000, 127.000000)'><path d='M142.280245,7.23952813 C141.987305,6.92353472 141.512432,6.92361662 141.219585,7.23971106 C140.926739,7.5558055 140.926815,8.06821394 141.219755,8.38420735 L145.498801,13 L149.780245,8.38162071 C150.073185,8.0656273 150.073261,7.55321886 149.780415,7.23712442 C149.487568,6.92102998 149.012695,6.92094808 148.719755,7.23694149 L145.498801,10.7113732 L142.280245,7.23952813 Z' id='arrow'></path></g></g></g></svg>") no-repeat right 8px center;
119-
}
120-
121123
.rdrNextPrevButton {
122124
position: relative;
123125
width: 22px;
@@ -257,7 +259,7 @@
257259
width: 36px;
258260
height: 36px;
259261
left: 4px;
260-
border: 1px solid $tc-dark-blue-70;
262+
border: 1px solid lighten($listing-checkbox-green, 70%);
261263
}
262264

263265
.rdrSelected,
@@ -272,7 +274,7 @@
272274
.rdrDayInPreview,
273275
.rdrDayStartPreview,
274276
.rdrDayEndPreview {
275-
border-color: $tc-dark-blue-70;
277+
border-color: lighten($listing-checkbox-green, 70%);
276278
top: 0;
277279
bottom: 0;
278280
}

src/shared/components/SortingSelectBar/style.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ $down-arrow-size: $base-unit;
133133
overflow: visible;
134134
}
135135

136+
.Select.is-focused:not(.is-open) > .Select-control {
137+
border-color: #137d60 !important;
138+
}
139+
136140
.Select-value-label {
137141
@include roboto-regular;
138142

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
}
1919

2020
.tooltip {
21-
font-weight: 500;
22-
font-size: 13px;
21+
font-weight: 400;
22+
font-size: 14px;
23+
line-height: 22px;
2324
color: $tc-white;
2425
letter-spacing: 0;
25-
padding: 15px;
26+
padding: 10px;
27+
border-radius: 8px;
28+
background-color: #2a2a2a;
2629
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
}
1919

2020
.tooltip {
21-
font-weight: 500;
22-
font-size: 13px;
21+
font-weight: 400;
22+
font-size: 14px;
23+
line-height: 22px;
2324
color: $tc-white;
2425
letter-spacing: 0;
25-
padding: 15px;
26+
padding: 10px;
27+
border-radius: 8px;
28+
background-color: #2a2a2a;
2629
}

src/shared/components/challenge-listing/ChallengeCard/Prize/Tip/style.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $prize-space-10: $base-unit * 2;
55
@include roboto-regular;
66

77
max-width: 480px;
8-
padding: 15px;
8+
padding: 10px 10px 0 10px;
99
overflow: hidden;
1010

1111
.bonuses {
@@ -15,15 +15,16 @@ $prize-space-10: $base-unit * 2;
1515
}
1616

1717
h1 {
18+
@include roboto-regular;
1819
border: none;
1920
color: $tc-white;
20-
font-size: 15px;
21-
line-height: 15px;
21+
font-size: 14px;
22+
line-height: 16px;
2223
margin: 0 0 $prize-space-10;
2324
padding: 0;
2425
text-align: left;
2526
text-transform: none;
26-
font-weight: 700;
27+
font-weight: 500;
2728
}
2829
}
2930

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import ChallengeSearchBar from 'containers/challenge-listing/ChallengeSearchBar'
3737
import { challenge as challengeUtils } from 'topcoder-react-lib';
3838
import { createStaticRanges } from 'utils/challenge-listing/date-range';
3939
import ArrowIcon from 'assets/images/ico-arrow-down.svg';
40-
import CircleIcon from 'assets/images/icon-circle.png';
40+
import CircleIcon from 'assets/images/icon-circle.svg';
4141
import Button from '../Button';
4242
import UiSimpleRemove from '../../Icons/ui-simple-remove.svg';
4343
import BucketSelector from '../../Sidebar/BucketSelector';
@@ -646,7 +646,7 @@ export default function FiltersPanel({
646646
className={style['tooltip-overlay']}
647647
trigger={['hover', 'focus']}
648648
>
649-
<img src={CircleIcon} alt="circle-icon" />
649+
<CircleIcon />
650650
</Tooltip>
651651
</div>
652652
</div>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ hr.hr {
332332
display: inline-block;
333333
line-height: 30px;
334334
min-width: 96px;
335-
width: 128px;
335+
width: 50%;
336336
margin-bottom: 6px;
337337

338338
@include xs-to-md {
@@ -467,8 +467,8 @@ hr.hr {
467467

468468
&:checked + .checkbox-label {
469469
&::before {
470-
background-color: #0681ff;
471-
border-color: #0681ff;
470+
background-color: $listing-checkbox-green;
471+
border-color: $listing-checkbox-green;
472472
}
473473

474474
&::after {
@@ -590,6 +590,7 @@ hr.hr {
590590

591591
.Select-menu-outer {
592592
margin-top: 1px;
593+
font-size: 14px;
593594
}
594595
}
595596
}
@@ -610,11 +611,15 @@ hr.hr {
610611

611612
.recommended-challenge-tooltip {
612613
position: absolute;
613-
right: 48px;
614+
right: 54px;
614615
display: flex;
615616
flex-direction: column;
616617
justify-content: center;
617618
height: 100%;
619+
620+
@include xs-to-md {
621+
left: 210px;
622+
}
618623
}
619624
}
620625
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
.container {
44
min-height: 178px;
5-
background-color: #fff;
5+
background-color: #f4f4f4;
66
border-radius: 4px;
77
display: flex;
88
justify-content: center;
99
flex-direction: column;
10-
margin-top: 20px;
10+
margin: 16px 24px 24px 24px;
1111
}
1212

1313
.icon {
@@ -52,7 +52,6 @@
5252

5353
.challenge-link {
5454
color: #2862b9;
55-
text-decoration: underline;
5655

5756
&:hover,
5857
&:active,

src/shared/components/challenge-listing/Tags.jsx

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import './style.scss';
1313
const VISIBLE_TAGS = 3;
1414

1515
/**
16-
* Implements <Tags> component
17-
*/
16+
* Implements <Tags> component
17+
*/
1818
export default function Tags({
1919
expand, isExpanded, tags, onTechTagClicked, challengesUrl, recommended, verifiedTags,
2020
}) {
@@ -38,33 +38,33 @@ export default function Tags({
3838
const additionalTags = (items, verifiedTagIndex) => (
3939
<div styleName="additionalTagWrapper">
4040
{
41-
items.map((item, index) => {
42-
if (index < verifiedTagIndex) {
43-
return (
44-
<VerifiedTag
45-
challengesUrl={challengesUrl}
46-
item={item}
47-
onClick={onClick}
48-
recommended={recommended}
49-
/>
50-
);
51-
}
52-
return (
53-
(
54-
<div styleName="additionalTag">
55-
<Tag
56-
onClick={() => onClick(item.trim())}
57-
key={item}
58-
role="button"
59-
to={tagRedirectLink(item)}
60-
>
61-
<span>{item}</span>
62-
</Tag>
63-
</div>
64-
)
65-
);
66-
})
67-
}
41+
items.map((item, index) => {
42+
if (index < verifiedTagIndex) {
43+
return (
44+
<VerifiedTag
45+
challengesUrl={challengesUrl}
46+
item={item}
47+
onClick={onClick}
48+
recommended={recommended}
49+
/>
50+
);
51+
}
52+
return (
53+
(
54+
<div styleName="additionalTag">
55+
<Tag
56+
onClick={() => onClick(item.trim())}
57+
key={item}
58+
role="button"
59+
to={tagRedirectLink(item)}
60+
>
61+
<span>{item}</span>
62+
</Tag>
63+
</div>
64+
)
65+
);
66+
})
67+
}
6868
</div>
6969
);
7070

@@ -94,7 +94,6 @@ export default function Tags({
9494
allTags.slice(VISIBLE_TAGS), verifiedTags.length - VISIBLE_TAGS,
9595
)}
9696
trigger={['hover', 'focus']}
97-
className="overlayTagBg"
9897
>
9998
<Tag
10099
onClick={() => onClick(item.trim())}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ div.progress-bar-tooltip {
1414
color: $tc-white;
1515
max-width: none;
1616
padding: 0 $base-unit * 3;
17+
background-color: #2a2a2a;
1718

1819
.rc-tooltip-inner {
1920
padding: 0 $base-unit * 3;
@@ -28,7 +29,7 @@ div.progress-bar-tooltip {
2829
line-height: $tip-space-15;
2930
min-width: $tip-offset;
3031
padding: $tip-space-15 0;
31-
background: $tc-gray-80;
32+
background: #2a2a2a;
3233
width: $tip-space-95;
3334

3435
&:last-child {

src/shared/components/challenge-listing/Tooltips/TrackAbbreviationTooltip/index.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import Tooltip from 'components/Tooltip';
1212
import './style.scss';
1313

1414
/**
15-
* Renders the tooltip's content.
16-
*/
15+
* Renders the tooltip's content.
16+
*/
1717
function Tip({
1818
track,
1919
type,
2020
}) {
2121
const trackStyle = track.replace(' ', '-').toLowerCase();
2222
return (
2323
<div styleName="track-abbreviation-tooltip">
24-
<div styleName={`header ${trackStyle}`}>
24+
<div styleName="header">
2525
{type.name}
2626
</div>
2727
<div styleName="body">
@@ -46,8 +46,8 @@ function placeArrow(TooltipNode) {
4646
}
4747

4848
/**
49-
* Renders the tooltip.
50-
*/
49+
* Renders the tooltip.
50+
*/
5151
function TrackAbbreviationTooltip({
5252
children,
5353
track,

0 commit comments

Comments
 (0)