Skip to content
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ workflows:
filters:
branches:
only:
- thrive-bug-fixes
- thrive-bug-fixes2
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
Expand Down
3 changes: 0 additions & 3 deletions src/assets/images/tc-edu/icon-radio-checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions src/assets/images/tc-edu/icon-radio-un-check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/shared/components/Contentful/SearchBar/SearchBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export class SearchBarInner extends Component {
<a className={theme.authorLink} href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_SEARCH_PATH}?author=${item.name}`}>
{item.tcHandle}
{
item.tcHandle ? (
item.name ? (
<span className={theme.authorName}>
{item.name}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class FilterAuthorInner extends Component {
}}
>
<span>{selected}</span>
<IconArrow className={theme['icon-arrow']} />
<IconArrow className={theme[isShowPopup ? 'icon-arrow-popup' : 'icon-arrow']} />
</button>
{isShowPopup && (
<div className={theme.popup}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ $text-black: #2a2a2a;
}
}

.icon-arrow-popup {
-moz-transform: none;
-o-transform: none;
-webkit-transform: none;
transform: none;

polygon {
fill: #aaa;
}
}

.popup {
position: absolute;
left: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ $text-black: #2a2a2a;

span {
margin-left: 11px;
cursor: default;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ export class FilterTagsInner extends Component {
value={inputValue}
onChange={(e) => { this.setState({ inputValue: e.target.value }); }}
onKeyDown={(e) => {
if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue)) {
if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue) && tags.length <= 4) {
onAddNewTag(inputValue);
this.setState({ inputValue: '' });
}
}}
maxLength="40"
/>
<div className={theme['tag-container']}>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export class TracksTagsInner extends Component {
type="text"
className={theme['tags-field']}
placeholder="Add tags to filter content..."
maxLength="40"
/>
</div>
</div>
Expand Down