Browse Source

Merge pull request #7889 from nocodb/nc-fix/scroll-behavior

Nc fix/scroll behavior
pull/7894/head
navi 8 months ago committed by GitHub
parent
commit
629ea3cf7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 12
      packages/nc-gui/assets/style.scss
  2. 2
      packages/nc-gui/components/account/AppStore.vue
  3. 2
      packages/nc-gui/components/account/License.vue
  4. 2
      packages/nc-gui/components/nc/Select.vue
  5. 2
      packages/nc-gui/components/project/ShareBaseDlg.vue
  6. 2
      packages/nc-gui/pages/account/index/users/[[nestedPage]].vue

12
packages/nc-gui/assets/style.scss

@ -65,7 +65,7 @@ main {
} }
.nc-scrollbar-md { .nc-scrollbar-md {
overflow-y: scroll; overflow-y: auto !important;
overflow-x: hidden; overflow-x: hidden;
scrollbar-width: thin !important; scrollbar-width: thin !important;
@ -89,7 +89,7 @@ main {
} }
.nc-scrollbar-lg { .nc-scrollbar-lg {
overflow-y: scroll; overflow-y: auto !important;
overflow-x: hidden; overflow-x: hidden;
scrollbar-width: thin !important; scrollbar-width: thin !important;
@ -113,7 +113,7 @@ main {
} }
.nc-scrollbar-x-md { .nc-scrollbar-x-md {
overflow-x: scroll; overflow-x: auto !important;
scrollbar-width: thin !important; scrollbar-width: thin !important;
@ -141,7 +141,7 @@ main {
} }
.nc-scrollbar-dark-md { .nc-scrollbar-dark-md {
overflow-y: scroll; overflow-y: auto !important;
overflow-x: hidden; overflow-x: hidden;
scrollbar-width: thin !important; scrollbar-width: thin !important;
@ -174,7 +174,7 @@ main {
} }
.nc-scrollbar-x-md-dark { .nc-scrollbar-x-md-dark {
overflow-x: scroll; overflow-x: auto !important;
scrollbar-width: thin !important; scrollbar-width: thin !important;
@ -204,7 +204,7 @@ main {
} }
.nc-scrollbar-x-lg { .nc-scrollbar-x-lg {
overflow-x: scroll; overflow-x: auto !important;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 8px; width: 8px;

2
packages/nc-gui/components/account/AppStore.vue

@ -1,5 +1,5 @@
<template> <template>
<div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2 px-5"> <div class="h-full overflow-y-auto scrollbar-thin-dull pt-2 px-5">
<div class="text-xl mt-4 mb-8 text-left font-weight-bold">{{ $t('title.appStore') }}</div> <div class="text-xl mt-4 mb-8 text-left font-weight-bold">{{ $t('title.appStore') }}</div>
<div> <div>
<LazyDashboardSettingsAppStore /> <LazyDashboardSettingsAppStore />

2
packages/nc-gui/components/account/License.vue

@ -36,7 +36,7 @@ loadLicense()
</script> </script>
<template> <template>
<div class="h-full overflow-y-scroll scrollbar-thin-dull"> <div class="h-full overflow-y-auto scrollbar-thin-dull">
<!-- <div class="text-xl mt-4 mb-8 text-center font-weight-bold">License</div>--> <!-- <div class="text-xl mt-4 mb-8 text-center font-weight-bold">License</div>-->
<!-- <div class="mx-auto w-150">--> <!-- <div class="mx-auto w-150">-->
<!-- <div>--> <!-- <div>-->

2
packages/nc-gui/components/nc/Select.vue

@ -109,7 +109,7 @@ const onChange = (value: string) => {
@apply !rounded-xl py-1.5; @apply !rounded-xl py-1.5;
.rc-virtual-list-holder { .rc-virtual-list-holder {
overflow-y: scroll; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
font-weight: 500; font-weight: 500;

2
packages/nc-gui/components/project/ShareBaseDlg.vue

@ -235,7 +235,7 @@ const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role
<div class="flex justify-between gap-3 w-full"> <div class="flex justify-between gap-3 w-full">
<div <div
ref="divRef" ref="divRef"
class="flex items-center border-1 gap-1 w-full overflow-x-scroll nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96" class="flex items-center border-1 gap-1 w-full overflow-x-auto nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96"
tabindex="0" tabindex="0"
:class="{ :class="{
'border-primary/100': isDivFocused, 'border-primary/100': isDivFocused,

2
packages/nc-gui/pages/account/index/users/[[nestedPage]].vue

@ -5,7 +5,7 @@ const { isUIAllowed } = useRoles()
</script> </script>
<template> <template>
<div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2"> <div class="h-full overflow-y-auto scrollbar-thin-dull pt-2">
<template <template
v-if=" v-if="
$route.params.nestedPage === 'password-reset' || $route.params.nestedPage === 'password-reset' ||

Loading…
Cancel
Save