diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue index 28c63b040c..241f5f526c 100644 --- a/packages/nc-gui-v2/app.vue +++ b/packages/nc-gui-v2/app.vue @@ -1,5 +1,11 @@ + + diff --git a/packages/nc-gui-v2/assets/style-v2.scss b/packages/nc-gui-v2/assets/style-v2.scss index c719affffa..24452b4569 100644 --- a/packages/nc-gui-v2/assets/style-v2.scss +++ b/packages/nc-gui-v2/assets/style-v2.scss @@ -17,6 +17,10 @@ main { @apply m-0 h-full w-full bg-white dark:(bg-black text-white); } +html { + overflow-y: auto !important; +} + main { @apply flex-0 w-full relative scrollbar-thin-dull; overflow-x: hidden; @@ -43,11 +47,6 @@ h1, h2, h3, h4, h5, h6, p, label, button, textarea, select { @apply color-transition; } -html { - overflow-y: auto !important; -} - - // menu item styling .nc-menu-item { @apply cursor-pointer text-xs flex items-center gap-2 px-4 py-3 relative after:(content-[''] absolute top-0 left-0 bottom-0 w-full h-full right-0 bg-current opacity-0 transition transition-opactity duration-100) hover:(after:(opacity-5)); @@ -57,6 +56,16 @@ html { } } +.nc-project-menu-item { + @apply cursor-pointer flex items-center gap-2 py-2 hover:text-primary after:(content-[''] absolute top-0 left-0 bottom-0 right-0 w-full h-full bg-current opacity-0 transition transition-opactity duration-100) hover:(after:(opacity-5)); + + &:hover { + .nc-icon { + @apply text-pink-500; + } + } +} + .nc-sidebar-right-item { @apply relative flex items-center; @@ -152,9 +161,9 @@ html { @apply transition-opacity duration-300 ease-in-out; } -.page-enter, +.page-enter-active, .page-leave-active, -.layout-enter, +.layout-enter-active, .layout-leave-active { @apply opacity-0; } @@ -182,4 +191,22 @@ html { .glow-enter, .glow-leave-active { @apply opacity-0; +} + +.scaling-btn { + @apply z-1 relative color-transition border border-gray-300 rounded-md p-3 bg-gray-100/50 text-white bg-primary; + + &::after { + @apply rounded-md absolute top-0 left-0 right-0 bottom-0 transition-all duration-150 ease-in-out bg-primary; + content: ''; + z-index: -1; + } + + &:hover::after { + @apply transform scale-110 ring ring-pink-500; + } + + &:active::after { + @apply ring ring-pink-500; + } } \ No newline at end of file diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index fabc254fa9..c033344d42 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -103,6 +103,7 @@ declare module '@vue/runtime-core' { MdiCheck: typeof import('~icons/mdi/check')['default'] MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default'] MdiClose: typeof import('~icons/mdi/close')['default'] + MdiCloseBox: typeof import('~icons/mdi/close-box')['default'] MdiCloseCircle: typeof import('~icons/mdi/close-circle')['default'] MdiCloseThick: typeof import('~icons/mdi/close-thick')['default'] MdiCodeJson: typeof import('~icons/mdi/code-json')['default'] @@ -134,6 +135,7 @@ declare module '@vue/runtime-core' { MdiFunction: typeof import('~icons/mdi/function')['default'] MdiGestureDoubleTap: typeof import('~icons/mdi/gesture-double-tap')['default'] MdiGithub: typeof import('~icons/mdi/github')['default'] + MdiGridLarge: typeof import('~icons/mdi/grid-large')['default'] MdiHeart: typeof import('~icons/mdi/heart')['default'] MdiHook: typeof import('~icons/mdi/hook')['default'] MdiInformation: typeof import('~icons/mdi/information')['default'] @@ -154,6 +156,7 @@ declare module '@vue/runtime-core' { MdiPlus: typeof import('~icons/mdi/plus')['default'] MdiPlusBoxOutline: typeof import('~icons/mdi/plus-box-outline')['default'] MdiPlusOutline: typeof import('~icons/mdi/plus-outline')['default'] + MdiPlusRoundedOutline: typeof import('~icons/mdi/plus-rounded-outline')['default'] MdiRefresh: typeof import('~icons/mdi/refresh')['default'] MdiReload: typeof import('~icons/mdi/reload')['default'] MdiRocketLaunchOutline: typeof import('~icons/mdi/rocket-launch-outline')['default'] diff --git a/packages/nc-gui-v2/components/cell/Checkbox.vue b/packages/nc-gui-v2/components/cell/Checkbox.vue index 9dce776a1a..0705a02495 100644 --- a/packages/nc-gui-v2/components/cell/Checkbox.vue +++ b/packages/nc-gui-v2/components/cell/Checkbox.vue @@ -1,6 +1,5 @@