From dc61a9790480277692ba90aedc58393bf6611d42 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Tue, 5 Dec 2023 20:54:09 +0530 Subject: [PATCH] style: Apply global style for select dropdown border insted of applying component level --- packages/nc-gui/assets/style.scss | 9 ++++++++- packages/nc-gui/components/account/UsersModal.vue | 2 +- packages/nc-gui/components/cell/MultiSelect.vue | 2 +- packages/nc-gui/components/cell/SingleSelect.vue | 2 +- .../dashboard/settings/data-sources/CreateBase.vue | 8 ++++---- .../dashboard/settings/data-sources/EditBase.vue | 2 +- packages/nc-gui/components/nc/Pagination.vue | 1 - packages/nc-gui/components/nc/Select.vue | 2 +- packages/nc-gui/components/smartsheet/ApiSnippet.vue | 2 +- .../components/smartsheet/column/AdvancedOptions.vue | 2 +- .../components/smartsheet/column/BarcodeOptions.vue | 2 -- .../components/smartsheet/column/CheckboxOptions.vue | 2 +- .../nc-gui/components/smartsheet/column/DateOptions.vue | 2 +- .../components/smartsheet/column/DateTimeOptions.vue | 4 ++-- .../components/smartsheet/column/DecimalOptions.vue | 2 +- .../components/smartsheet/column/DurationOptions.vue | 2 +- .../components/smartsheet/column/PercentOptions.vue | 2 +- .../components/smartsheet/column/PgBinaryOptions.vue | 1 - .../components/smartsheet/column/RatingOptions.vue | 4 ++-- .../nc-gui/components/smartsheet/toolbar/SearchData.vue | 2 +- packages/nc-gui/components/template/Editor.vue | 2 +- packages/nc-gui/components/workspace/InviteCollabDlg.vue | 2 +- packages/nc-gui/components/workspace/MoveProjectDlg.vue | 2 +- 23 files changed, 32 insertions(+), 29 deletions(-) diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss index 7d9c703132..79bd9f9e00 100644 --- a/packages/nc-gui/assets/style.scss +++ b/packages/nc-gui/assets/style.scss @@ -225,6 +225,10 @@ a { @apply !rounded-md; } } +// select dropdown border style +.ant-select-dropdown { + @apply border-1 border-gray-200 +} // menu item styling .nc-menu-item { @@ -426,7 +430,10 @@ a { .ant-dropdown-menu-submenu { @apply !py-0; - + + &.ant-dropdown-menu-submenu-popup{ + @apply border-1 border-gray-200 + } .ant-dropdown-menu, .ant-menu { @apply m-0 p-0; diff --git a/packages/nc-gui/components/account/UsersModal.vue b/packages/nc-gui/components/account/UsersModal.vue index 46373c1e7c..0afba4bae9 100644 --- a/packages/nc-gui/components/account/UsersModal.vue +++ b/packages/nc-gui/components/account/UsersModal.vue @@ -193,7 +193,7 @@ const emailInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
{{ $t('labels.selectUserRole') }}
- + { :open="isOpen && editAllowed" :disabled="readOnly || !editAllowed" :class="{ 'caret-transparent': !hasEditRoles }" - :dropdown-class-name="`nc-dropdown-multi-select-cell border-1 border-gray-200 ${isOpen ? 'active' : ''}`" + :dropdown-class-name="`nc-dropdown-multi-select-cell ${isOpen ? 'active' : ''}`" @search="search" @keydown.stop > diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index ab347b654d..9acccd11e2 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -291,7 +291,7 @@ const selectedOpt = computed(() => { :open="isOpen && editAllowed" :disabled="readOnly || !editAllowed" :show-arrow="hasEditRoles && !readOnly && active && vModel === null" - :dropdown-class-name="`nc-dropdown-single-select-cell border-1 border-gray-200 ${isOpen && active ? 'active' : ''}`" + :dropdown-class-name="`nc-dropdown-single-select-cell ${isOpen && active ? 'active' : ''}`" :show-search="!isMobileMode && isOpen && active" @select="onSelect" @keydown="onKeydown($event)" diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue index 7c8f5de0de..a62f6b0940 100644 --- a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue +++ b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue @@ -451,7 +451,7 @@ const toggleModal = (val: boolean) => { { {{ opt }} @@ -617,7 +617,7 @@ const toggleModal = (val: boolean) => { {{ tp }} @@ -626,7 +626,7 @@ const toggleModal = (val: boolean) => { {{ tp }} diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue index e0a34263be..8c2d04918f 100644 --- a/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue +++ b/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue @@ -441,7 +441,7 @@ onMounted(async () => { - + {{ opt }} diff --git a/packages/nc-gui/components/nc/Pagination.vue b/packages/nc-gui/components/nc/Pagination.vue index fca8788d8e..8072f0654c 100644 --- a/packages/nc-gui/components/nc/Pagination.vue +++ b/packages/nc-gui/components/nc/Pagination.vue @@ -93,7 +93,6 @@ const pagesList = computed(() => {