Skip to content
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.

Sign up for GitHub

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

Mohan - Finishing for Vedant - Fix assign team button hover at smaller resolutions #2708

Merged
merged 12 commits into from
Jan 12, 2025
Merged

Mohan - Finishing for Vedant - Fix assign team button hover at smaller resolutions #2708

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cf0020b
Fix assign team button hover at smaller resolutions
vedantg24 Sep 21, 2024
429c620
Updated message
vedantg24 Sep 24, 2024
872981d
Merge branch 'development' into vedant-fix-assign-team-button-hover-a…
vedantg24 Oct 11, 2024
ceee08a
Update message
vedantg24 Oct 11, 2024
aa7c5eb
Merge branch 'development' into vedant-fix-assign-team-button-hover-a…
vedantg24 Nov 4, 2024
b06a074
Resolve merge conflict
vedantg24 Nov 4, 2024
ccfaf85
fixmsg
mohangadde1 Dec 15, 2024
41bde9e
fixmsg
mohangadde1 Dec 23, 2024
2243e54
added id for Button
mohangadde1 Dec 23, 2024
fd4d4d1
fix code structure
mohangadde1 Dec 24, 2024
0726085
resolve conflict
mohangadde1 Dec 24, 2024
60ea212
added tip in mobile view
mohangadde1 Jan 12, 2025
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
37 changes: 23 additions & 14 deletions src/components/UserProfile/TeamsAndProjects/UserTeamsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ const UserTeamsTable = props => {
target="teamCodeAssign"
toggle={toggleTeamCodeExplainTooltip}
>
This team code should only used by admin/owner, and has nothing to do with
This team code should only be used by admin/owner, and has nothing to do with
the team data model.
</Tooltip>
</>
Expand Down Expand Up @@ -368,25 +368,34 @@ const UserTeamsTable = props => {
</Col>
</div>
{props.edit && props.role && (
<Col
md="12"
style={{ padding: '0' }}
>
<Col md="12" style={{ padding: '0' }}>
{canAssignTeamToUsers ? (
props.disabled ? (
<Button className="btn-addteam" color="primary" style={boxStyle} disabled>
Assign Team
</Button>
) : (
<Button
className="btn-addteam"
color="primary"
onClick={() => {
props.onButtonClick();
}}
>
Assign Team
</Button>
<>
<Button
id="teamCodeAssign"
className="btn-addteam"
color="primary"
onClick={() => {
props.onButtonClick();
}}
>
Assign Team
</Button>
<Tooltip
placement="top" // Adjust the placement as needed
isOpen={teamCodeExplainTooltip}
target="teamCodeAssign"
toggle={toggleTeamCodeExplainTooltip}
>
This team code should only be used by admin/owner, and has nothing to do with
the team data model.
</Tooltip>
</>
)
) : (
<></>
Expand Down