Browse Source

Merge pull request #3713 from nocodb/fix/fullscreen-btn

Fix: Fullscreen button bugs
pull/3720/head
Pranav C 2 years ago committed by GitHub
parent
commit
fe0f9dd912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      packages/nc-gui/components/general/FullScreen.vue
  2. 2
      packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue
  3. 10
      packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue

6
packages/nc-gui/components/general/FullScreen.vue

@ -14,9 +14,11 @@ const isSidebarsOpen = computed({
</script>
<template>
<a-tooltip>
<a-tooltip placement="left">
<!-- todo: i18n -->
<template #title> {{ isSidebarsOpen ? 'Full width' : 'Exit full width' }}</template>
<template #title>
<span class="text-xs">{{ isSidebarsOpen ? 'Full width' : 'Exit full width' }}</span>
</template>
<div
v-e="['c:toolbar:fullscreen']"
class="nc-fullscreen-btn cursor-pointer flex align-center self-center px-2 py-2 mr-2"

2
packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue

@ -281,7 +281,7 @@ defineExpose({
{{ $t('activity.addFilter') }}
</div>
</a-button>
<a-button class="text-capitalize !text-gray-500" v-if="!webHook" @click.stop="addFilterGroup">
<a-button v-if="!webHook" class="text-capitalize !text-gray-500" @click.stop="addFilterGroup">
<div class="flex items-center gap-1">
<!-- <v-icon small color="grey"> mdi-plus </v-icon> -->
<!-- Add Filter Group -->

10
packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue

@ -148,14 +148,4 @@ function onEdit(targetKey: number, action: 'add' | 'remove' | string) {
:deep(.ant-tabs-tab-remove) {
@apply mt-[3px];
}
.nc-tab-bar {
:deep(.nc-fullscreen-icon) {
@apply opacity-0 transition;
}
&:hover :deep(.nc-fullscreen-icon) {
@apply opacity-100;
}
}
</style>

Loading…
Cancel
Save