diff --git a/packages/nc-gui/composables/useViews.ts b/packages/nc-gui/composables/useViews.ts index 636f27e127..8107568ccc 100644 --- a/packages/nc-gui/composables/useViews.ts +++ b/packages/nc-gui/composables/useViews.ts @@ -25,7 +25,6 @@ function _useViews(meta: MaybeRef) { watch(() => unref(meta), loadViews, { immediate: true }) return { views, isLoading, loadViews } - // return createSharedComposable({ views, isLoading, loadViews }) } export default createSharedComposable(_useViews) diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue index d6be2f1610..7c7050d58e 100644 --- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue +++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue @@ -641,11 +641,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => { .nc-left-sidebar { .nc-sidebar-left-toggle-icon { - // <<<<<<< HEAD - // @apply opacity-0 transition-opactity duration-200 transition-color text-white/80 hover: text-white/100; - // ======= @apply opacity-0 transition-opactity duration-200 transition-color text-gray-500/80 hover:text-gray-500/100; - // >>>>>>> develop .nc-left-sidebar { @apply !border-r-0;