Skip to content

additional fixes from challenge listing reskin #6334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/shared/components/DateRangePicker/DateInput/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

input {
padding: 5px;
height: 30px !important;
height: 40px !important;
font-size: 13px !important;
line-height: 16px !important;
margin-bottom: 0 !important;
Expand Down Expand Up @@ -43,5 +43,5 @@
position: absolute;
cursor: pointer;
margin-left: -22px;
margin-top: 6px;
margin-top: 11px;
}
5 changes: 4 additions & 1 deletion src/shared/components/DateRangePicker/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@

.isRange {
:global {
.rdrStartEdge, .rdrEndEdge {
.rdrStartEdge,
.rdrEndEdge {
color: $listing-checkbox-green !important;
}

.rdrDayHovered {
background: $listing-checkbox-green !important;
}

.rdrDay {
.rdrInRange {
background: lighten($listing-checkbox-green, 30%) !important;
Expand Down
3 changes: 3 additions & 0 deletions src/shared/components/SortingSelectBar/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ $down-arrow-size: $base-unit;
display: block;
padding: 8px 20px;
z-index: 100000;
border-bottom: 1px solid #aaa;
border-left: 1px solid #aaa;
border-right: 1px solid #aaa;
}

.Select-option:last-child {
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/SwitchWithLabel/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function SwitchWithLabel({
switch: theme.switch,
}}
/>
{labelAfter}
<span>{labelAfter}</span>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Tooltip/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.rc-tooltip-inner {
border-radius: 3px;
border-radius: 8px;
background: $tc-gray-80;
padding: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}

.link:hover {
color: $tc-dark-blue-110;
color: $tc-black;
}

.number {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ $prize-space-10: $base-unit * 2;

h1 {
@include roboto-regular;

border: none;
color: $tc-white;
font-size: 14px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ export default function FiltersPanel({
onSwitch={(e) => {
let { types } = filterState;

if (e.target.checked) {
if (e) {
types = types.concat(option.value);
} else {
types = types.filter(type => type !== option.value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ hr.hr {
width: 130px;
}

@include md-to-lg {
width: 26%;
}

.radio-label {
display: inline-block;
padding-left: 24px;
Expand All @@ -362,6 +366,7 @@ hr.hr {
border: 1px solid #aaa;
border-radius: 50%;
box-shadow: 0 1px 2px 0 rgba($tc-black, 0.29);
background: #fff;
}

&::after {
Expand Down Expand Up @@ -585,12 +590,17 @@ hr.hr {
.Select.is-focused > .Select-control {
outline: none;
box-shadow: none;
border-color: #137d60 !important;
border-color: #151516 !important;
}

.Select-menu-outer {
margin-top: 1px;
font-size: 14px;

.Select-option.is-selected {
background-color: #137d60 !important;
color: $tc-white !important;
}
}
}
}
Expand All @@ -611,7 +621,7 @@ hr.hr {

.recommended-challenge-tooltip {
position: absolute;
right: 54px;
left: 210px;
display: flex;
flex-direction: column;
justify-content: center;
Expand All @@ -625,9 +635,9 @@ hr.hr {
}

.tctooltiptext {
background: $tc-white;
color: $tc-gray-90;
border-radius: 3px;
background: $tc-black;
color: $tc-white;
border-radius: 8px;
padding: 10px;
}

Expand All @@ -642,6 +652,6 @@ hr.hr {
margin-left: -5px;
border-width: 5px 5px 0;
left: 50%;
border-top-color: $tc-white;
border-top-color: $tc-black;
z-index: 1000;
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ div.progress-bar-tooltip {

.rc-tooltip-inner {
padding: 0 $base-unit * 3;
border-radius: 8px;
}

.tip {
Expand Down
24 changes: 16 additions & 8 deletions src/shared/components/challenge-listing/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,6 @@ $challenge-radius-4: $corner-radius * 2;
}
}

.recommended-plus-tag {
margin-left: 3px;
display: inline-block;
background-color: $tc-white;
}

.tag {
button {
border-radius: 2px;
Expand All @@ -146,13 +140,23 @@ $challenge-radius-4: $corner-radius * 2;
font-weight: 500;

&:hover {
background-color: #d4d4d4;
background-color: #d4d4d4 !important;
}
}
}

.recommended-plus-tag {
margin-left: 3px;
display: inline-block;
background-color: $tc-white;

button:hover {
background-color: #d4d4d4 !important;
}
}

.additionalTagWrapper {
background: $tc-white;
background: $tc-black;
display: inline-block;
border-radius: 2px;
padding: 3px 4px;
Expand Down Expand Up @@ -181,6 +185,10 @@ $challenge-radius-4: $corner-radius * 2;
margin-top: 5px;
margin-left: 3px;
display: inline-block;

& > button:hover {
background-color: #d4d4d4 !important;
}
}

.tagContainer {
Expand Down