Browse Source

fix: Improved scrollbar style and adding more padding to table

pull/6737/head
Muhammed Mustafa 11 months ago
parent
commit
7d599da664
  1. 64
      packages/nc-gui/assets/style.scss
  2. 4
      packages/nc-gui/components/smartsheet/grid/Table.vue

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

@ -54,7 +54,7 @@ main {
} }
.mobile { .mobile {
.nc-scrollbar-md, .nc-scrollbar-dark-md, .nc-scrollbar-dark-md, .nc-scrollbar-sm-dark, .nc-scrollbar-x-md, .nc-scrollbar-x-md-dark { .nc-scrollbar-md, .nc-scrollbar-x-md, .nc-scrollbar-dark-md, .nc-scrollbar-x-md-dark, .nc-scrollbar-x-lg {
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0px; width: 0px;
} }
@ -77,26 +77,20 @@ main {
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
width: 4px; width: 4px;
@apply bg-gray-300; @apply bg-gray-200;
} }
&::-webkit-scrollbar-thumb:hover { &::-webkit-scrollbar-thumb:hover {
@apply bg-gray-400; @apply bg-gray-300;
} }
} }
.nc-scrollbar-dark-md { .nc-scrollbar-x-md {
overflow-y: scroll; overflow-x: scroll;
overflow-x: hidden;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 4px; width: 4px;
height: 4px; height: 4px;
} }
&::-webkit-scrollbar-track {
-webkit-border-radius: 10px;
border-radius: 10px;
}
&::-webkit-scrollbar-track-piece { &::-webkit-scrollbar-track-piece {
width: 0px; width: 0px;
} }
@ -107,21 +101,27 @@ main {
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
width: 4px; width: 4px;
@apply bg-gray-300; @apply bg-gray-200;
} }
&::-webkit-scrollbar-thumb:hover { &::-webkit-scrollbar-thumb:hover {
@apply bg-gray-400; @apply bg-gray-300;
} }
} }
.nc-scrollbar-sm-dark { .nc-scrollbar-dark-md {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 2px; width: 4px;
height: 2px; height: 4px;
}
&::-webkit-scrollbar-track {
-webkit-border-radius: 10px;
border-radius: 10px;
} }
&::-webkit-scrollbar-track-piece { &::-webkit-scrollbar-track-piece {
width: 0px; width: 0px;
@ -130,6 +130,9 @@ main {
@apply bg-transparent; @apply bg-transparent;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
-webkit-border-radius: 10px;
border-radius: 10px;
width: 4px; width: 4px;
@apply bg-gray-300; @apply bg-gray-300;
} }
@ -138,7 +141,7 @@ main {
} }
} }
.nc-scrollbar-x-md { .nc-scrollbar-x-md-dark {
overflow-x: scroll; overflow-x: scroll;
&::-webkit-scrollbar { &::-webkit-scrollbar {
@ -152,21 +155,26 @@ main {
@apply bg-transparent; @apply bg-transparent;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
-webkit-border-radius: 10px;
border-radius: 10px;
width: 4px; width: 4px;
@apply bg-gray-200; background-color: rgba(0, 0, 0, 0.3)
} }
&::-webkit-scrollbar-thumb:hover { &::-webkit-scrollbar-thumb:hover {
@apply bg-gray-300; background-color: rgba(0, 0, 0, 0.4)
} }
} }
.nc-scrollbar-x-lg {
.nc-scrollbar-x-md-dark {
overflow-x: scroll; overflow-x: scroll;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 4px; width: 6px;
height: 4px; height: 6px;
} }
&::-webkit-scrollbar-track-piece { &::-webkit-scrollbar-track-piece {
width: 0px; width: 0px;
@ -175,11 +183,15 @@ main {
@apply bg-transparent; @apply bg-transparent;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
width: 4px; -webkit-border-radius: 10px;
@apply bg-gray-300 !bg-opacity-100; border-radius: 10px;
width: 6px;
@apply bg-gray-200;
} }
&::-webkit-scrollbar-thumb:hover { &::-webkit-scrollbar-thumb:hover {
@apply bg-gray-400; @apply bg-gray-300;
} }
} }

4
packages/nc-gui/components/smartsheet/grid/Table.vue

@ -371,7 +371,7 @@ const gridWrapperClass = computed<string>(() => {
const classes = [] const classes = []
if (headerOnly !== true) { if (headerOnly !== true) {
if (!scrollParent.value) { if (!scrollParent.value) {
classes.push('nc-scrollbar-x-md-dark overflow-auto') classes.push('nc-scrollbar-x-lg overflow-auto')
} }
} else { } else {
classes.push('overflow-visible') classes.push('overflow-visible')
@ -1209,7 +1209,7 @@ const loaderText = computed(() => {
<div class="table-overlay" :class="{ 'nc-grid-skelton-loader': showSkeleton }"> <div class="table-overlay" :class="{ 'nc-grid-skelton-loader': showSkeleton }">
<table <table
ref="smartTable" ref="smartTable"
class="xc-row-table nc-grid backgroundColorDefault !h-auto bg-white relative" class="xc-row-table nc-grid backgroundColorDefault !h-auto bg-white relative pr-60 pb-12"
:class="{ :class="{
mobile: isMobileMode, mobile: isMobileMode,
desktop: !isMobileMode, desktop: !isMobileMode,

Loading…
Cancel
Save