Skip to content

Commit

Permalink
Fixing remove user icon.
Browse files Browse the repository at this point in the history
  • Loading branch information
krulis-martin committed Aug 21, 2023
1 parent 7a17b93 commit 0d8d920
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';

import Button, { TheButtonGroup } from '../../widgets/TheButton';
import UsersNameContainer from '../../../containers/UsersNameContainer';
import Icon, { AdminRoleIcon, ObserverIcon, SupervisorIcon, UserIcon, LoadingIcon } from '../../icons';
import { AdminRoleIcon, ObserverIcon, RemoveUserIcon, SupervisorIcon, UserIcon, LoadingIcon } from '../../icons';

const SupervisorsListItem = ({
showButtons,
Expand Down Expand Up @@ -157,7 +157,7 @@ const SupervisorsListItem = ({
onClick={() => removeMember(groupId, id)}
variant="danger"
disabled={pendingMembership}>
<Icon icon="user-slash" smallGapRight smallGapLeft fixedWidth />
<RemoveUserIcon smallGapRight smallGapLeft fixedWidth />
</Button>
</OverlayTrigger>
)}
Expand Down
1 change: 1 addition & 0 deletions src/components/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export const RedoIcon = props => <Icon {...props} icon="redo-alt" />;
export const ReferenceSolutionIcon = props => <Icon {...props} icon="book" />;
export const RefreshIcon = props => <Icon {...props} icon="sync" />;
export const RemoveIcon = props => <Icon {...props} icon="minus-circle" />;
export const RemoveUserIcon = props => <Icon {...props} icon="user-slash" />;
export const ResultsIcon = props => <Icon {...props} icon="chart-line" />;
export const ReviewIcon = ({ review = null, ...props }) =>
review && review.closedAt ? (
Expand Down
5 changes: 2 additions & 3 deletions src/components/widgets/Sidebar/MenuAvatar/MenuAvatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import classnames from 'classnames';

import '../Sidebar.css';
import AvatarContainer from '../../../../containers/AvatarContainer/AvatarContainer';
import Icon from '../../../icons';
import { RemoveUserIcon } from '../../../icons';

const MenuAvatar = ({
title,
Expand Down Expand Up @@ -38,8 +38,7 @@ const MenuAvatar = ({

{onRemove && (
<span className="sidebarAvatarRemoveIcon">
<Icon
icon="user-slash"
<RemoveUserIcon
className="text-danger"
timid
gapRight
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { setAuthor, setAdmins } from '../../redux/modules/exercises';
import { getExerciseSetAuthorStatus, getExerciseSetAdminsStatus } from '../../redux/selectors/exercises';

import Button, { TheButtonGroup } from '../../components/widgets/TheButton';
import { AdminIcon, AuthorIcon, LoadingIcon, WarningIcon } from '../../components/icons';
import { AdminIcon, AuthorIcon, LoadingIcon, RemoveUserIcon, WarningIcon } from '../../components/icons';

const ExerciseUserButtonsContainer = ({
exercise,
Expand Down Expand Up @@ -72,7 +72,7 @@ const ExerciseUserButtonsContainer = ({
{setAdminsStatus ? (
<LoadingIcon fixedWidth />
) : isAdmin ? (
<AdminIcon fixedWidth />
<RemoveUserIcon fixedWidth />
) : (
<AdminIcon fixedWidth />
)}
Expand Down

0 comments on commit 0d8d920

Please sign in to comment.