Skip to content

Commit 83e0bbf

Browse files
Merge pull request #5573 from topcoder-platform/thrive-bug-fixes2
Thrive bug fixes2
2 parents 369d928 + f783410 commit 83e0bbf

File tree

9 files changed

+19
-10
lines changed

9 files changed

+19
-10
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ workflows:
361361
filters:
362362
branches:
363363
only:
364-
- thrive-bug-fixes
364+
- thrive-bug-fixes2
365365
# This is stage env for production QA releases
366366
- "build-prod-staging":
367367
context : org-global

src/assets/images/tc-edu/icon-radio-checked.svg

Lines changed: 0 additions & 3 deletions
Loading

src/assets/images/tc-edu/icon-radio-un-check.svg

Lines changed: 1 addition & 3 deletions
Loading

src/shared/components/Contentful/SearchBar/SearchBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ export class SearchBarInner extends Component {
324324
<a className={theme.authorLink} href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_SEARCH_PATH}?author=${item.name}`}>
325325
{item.tcHandle}
326326
{
327-
item.tcHandle ? (
327+
item.name ? (
328328
<span className={theme.authorName}>
329329
{item.name}
330330
</span>

src/shared/components/Contentful/SearchPageFilter/FilterAuthor/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class FilterAuthorInner extends Component {
7272
}}
7373
>
7474
<span>{selected}</span>
75-
<IconArrow className={theme['icon-arrow']} />
75+
<IconArrow className={theme[isShowPopup ? 'icon-arrow-popup' : 'icon-arrow']} />
7676
</button>
7777
{isShowPopup && (
7878
<div className={theme.popup}>

src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ $text-black: #2a2a2a;
5353
}
5454
}
5555

56+
.icon-arrow-popup {
57+
-moz-transform: none;
58+
-o-transform: none;
59+
-webkit-transform: none;
60+
transform: none;
61+
62+
polygon {
63+
fill: #aaa;
64+
}
65+
}
66+
5667
.popup {
5768
position: absolute;
5869
left: 0;

src/shared/components/Contentful/SearchPageFilter/FilterRadio/themes/default.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ $text-black: #2a2a2a;
2828

2929
span {
3030
margin-left: 11px;
31+
cursor: default;
3132
}
3233
}

src/shared/components/Contentful/SearchPageFilter/FilterTags/index.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,12 @@ export class FilterTagsInner extends Component {
6666
value={inputValue}
6767
onChange={(e) => { this.setState({ inputValue: e.target.value }); }}
6868
onKeyDown={(e) => {
69-
if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue)) {
69+
if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue) && tags.length <= 4) {
7070
onAddNewTag(inputValue);
7171
this.setState({ inputValue: '' });
7272
}
7373
}}
74+
maxLength="40"
7475
/>
7576
<div className={theme['tag-container']}>
7677
{

src/shared/components/Contentful/TracksFilter/TracksTags/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export class TracksTagsInner extends Component {
8585
type="text"
8686
className={theme['tags-field']}
8787
placeholder="Add tags to filter content..."
88+
maxLength="40"
8889
/>
8990
</div>
9091
</div>

0 commit comments

Comments
 (0)