clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-05-04 22:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12100 from nocodb/nc-fix/use-danger-menu-item-prop

Browse Source 
fix(nc-gui): use danger NcMenuItem prop instead of hardcoding style
This commit is contained in:
Raju Udava
2025-08-15 15:43:32 +05:30
committed by GitHub
parent 4d46ad638a bf4b40c125
commit d2d1224a36
24 changed files with 67 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/nc-gui/components/workspace/CollaboratorsList.vue
View File

@@ -438,7 +438,7 @@ const handleScroll = (e) => {
<NcMenu variant="small">
<template v-if="isAdminPanel">
<NcMenuItem data-testid="nc-admin-org-user-delete">
<GeneralIcon class="text-gray-800" icon="signout" />
<GeneralIcon icon="signout" />
<span>{{ $t('labels.signOutUser') }}</span>
</NcMenuItem>
@@ -450,10 +450,10 @@ const handleScroll = (e) => {
</template>
<NcMenuItem
:disabled="!isDeleteOrUpdateAllowed(record)"
:class="{ '!text-red-500 !hover:bg-red-50': isDeleteOrUpdateAllowed(record) }"
danger
@click="removeCollaborator(record.id, currentWorkspace?.id)"
>
<MaterialSymbolsDeleteOutlineRounded />
<GeneralIcon icon="delete" />
{{ record.id === user.id ? t('activity.leaveWorkspace') : t('activity.removeUser') }}
</NcMenuItem>
</NcTooltip>

5
packages/nc-gui/components/workspace/integrations/ConnectionsTab.vue
View File

@@ -578,10 +578,7 @@ onKeyStroke('ArrowDown', onDown)
</NcTooltip>
<template v-if="integration?.sub_type !== SyncDataType.NOCODB">
<NcDivider />
<NcMenuItem
class="!text-nc-content-red-medium !hover:bg-nc-bg-red-light"
@click="openDeleteIntegration(integration)"
>
<NcMenuItem danger @click="openDeleteIntegration(integration)">
<GeneralIcon icon="delete" />
{{ $t('general.delete') }}
</NcMenuItem>