Skip to content

Commit

Permalink
fix: Close icon missing in roles modal (#2946)
Browse files Browse the repository at this point in the history
  • Loading branch information
novakzaballa committed Nov 9, 2023
1 parent a0eefdd commit 4960f7e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
10 changes: 9 additions & 1 deletion frontend/web/components/EditPermissions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import React, {
useImperativeHandle,
} from 'react'
import { find } from 'lodash'
import { close as closeIcon } from 'ionicons/icons'
import { IonIcon } from '@ionic/react'

import _data from 'common/data/base/_data'
import {
AvailablePermission,
Expand Down Expand Up @@ -646,7 +649,12 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = forwardRef(
style={{ marginBottom: 4, marginTop: 4 }}
>
<span className='font-weight-bold'>{r.name}</span>
<span className='chip-icon ion ion-ios-close' />
<span className='chip-icon ion'>
<IonIcon
icon={closeIcon}
style={{ fontSize: '13px' }}
/>
</span>
</Row>
))}
<Button
Expand Down
16 changes: 14 additions & 2 deletions frontend/web/components/modals/CreateRole.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import {
useDeleteRolePermissionGroupMutation,
useGetRolePermissionGroupQuery,
} from 'common/services/useRolePermissionGroup'
import { close as closeIcon } from 'ionicons/icons'
import { IonIcon } from '@ionic/react'

type CreateRoleType = {
organisationId?: string
Expand Down Expand Up @@ -450,7 +452,12 @@ const CreateRole: FC<CreateRoleType> = ({
<span className='font-weight-bold'>
{u.first_name} {u.last_name}
</span>
<span className='chip-icon ion ion-ios-close' />
<span className='chip-icon ion'>
<IonIcon
icon={closeIcon}
style={{ fontSize: '13px' }}
/>
</span>
</Row>
))}
</div>
Expand Down Expand Up @@ -486,7 +493,12 @@ const CreateRole: FC<CreateRoleType> = ({
className='chip my-1 role-list'
>
<span className='font-weight-bold'>{g.name}</span>
<span className='chip-icon ion ion-ios-close' />
<span className='chip-icon ion'>
<IonIcon
icon={closeIcon}
style={{ fontSize: '13px' }}
/>
</span>
</Row>
))}
</div>
Expand Down

3 comments on commit 4960f7e

@vercel
Copy link

@vercel vercel bot commented on 4960f7e Nov 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 4960f7e Nov 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 4960f7e Nov 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

docs – ./docs

docs-flagsmith.vercel.app
docs-git-main-flagsmith.vercel.app
docs.flagsmith.com
docs.bullet-train.io

Please sign in to comment.