Skip to content

Commit e87415a

Browse files
author
Vikas Agarwal
committed
fix: pulled again changes for github#1172-Improve UX for Close Task button
1 parent fa66f51 commit e87415a

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/components/ChallengeEditor/ChallengeViewTabs/ChallengeViewTabs.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $tc-white: #FFFFFF;
3434
.button {
3535
height: 40px;
3636
span {
37-
padding: 0 20px;
37+
padding: 0 15px;
3838
}
3939
}
4040

src/components/ChallengeEditor/ChallengeViewTabs/index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,13 @@ const ChallengeViewTabs = ({
119119
{isTask && challenge.status === 'Active' && (
120120
<div className={styles.button}>
121121
{assignedMemberDetails ? (
122-
<PrimaryButton
123-
text={'Close Task'}
124-
type={'danger'}
125-
onClick={onCloseTask}
126-
/>
122+
<Tooltip content={MESSAGE.MARK_COMPLETE}>
123+
<PrimaryButton text={'Mark Complete'} type={'success'} onClick={onCloseTask} />
124+
</Tooltip>
127125
) : (
128126
<Tooltip content={MESSAGE.NO_TASK_ASSIGNEE}>
129127
{/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
130-
<PrimaryButton text={'Close Task'} type={'disabled'} />
128+
<PrimaryButton text={'Mark Complete'} type={'disabled'} />
131129
</Tooltip>
132130
)}
133131
</div>

0 commit comments

Comments
 (0)