From e96eb221512784b2a8c313f7c67c2d2e40810480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Tue, 28 May 2024 10:58:33 -0400 Subject: [PATCH 1/4] Added a reset size functionality to tables --- .../js/components/shared/FilterTable.vue | 20 +++++++++---------- resources/sass/_scrollbar.scss | 9 ++++++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/js/components/shared/FilterTable.vue b/resources/js/components/shared/FilterTable.vue index 3889be6e99..f1005b8005 100644 --- a/resources/js/components/shared/FilterTable.vue +++ b/resources/js/components/shared/FilterTable.vue @@ -37,6 +37,7 @@
{ + if (!this.originalWidths[index]) { + this.originalWidths[index] = headerColumn.width || this.calculateContent(index); + } if (this.calculateContent(index) !== 0) { headerColumn.width = (this.calculateContent(index) * widthAdjust) - 32; } @@ -250,6 +255,11 @@ export default { this.resizingColumnIndex = -1; } }, + resetSize(index) { + if (this.originalWidths[index]) { + this.visibleHeaders[index].width = this.originalWidths[index]; + } + }, handleRowClick(row, event) { this.$emit("table-row-click", row, event); }, @@ -279,8 +289,6 @@ export default { border-right: 1px solid rgba(0, 0, 0, 0.125); border-bottom: 1px solid rgba(0, 0, 0, 0.125); border-radius: 5px; - scrollbar-width: 8px; - scrollbar-color: #6C757D; max-height: calc(100vh - 150px); } @@ -429,14 +437,6 @@ export default { white-space: nowrap; } } -.pm-table-container::-webkit-scrollbar { - width: 8px; - height: 8px; -} -.pm-table-container::-webkit-scrollbar-thumb { - background-color: #6C757D; - border-radius: 20px; -} .ellipsis-dropdown-main ul.dropdown-menu.dropdown-menu-right.show { max-height: 250px; overflow-y: auto; diff --git a/resources/sass/_scrollbar.scss b/resources/sass/_scrollbar.scss index 4be0f570e2..8346601d4d 100644 --- a/resources/sass/_scrollbar.scss +++ b/resources/sass/_scrollbar.scss @@ -1,16 +1,19 @@ /* Works on Firefox */ * { scrollbar-width: thin; - scrollbar-color: #6A7888 #f7f9fb; + scrollbar-color: rgba(73, 94, 109, 0.5) transparent; } /* Works on Chrome, Edge, and Safari */ *::-webkit-scrollbar { width: 8px; + height: 8px; } *::-webkit-scrollbar-track { - background: linear-gradient(0deg, rgba(255, 255, 255, 0.60) 0%, rgba(255, 255, 255, 0.60) 100%), var(--icons-buttons-inter, #f7f9fb); + background-color: transparent; + box-shadow: -5px 5px 5px rgba(0, 0, 0, 0.5); + border-radius: 4px; } *::-webkit-scrollbar-thumb { - background-color: #6A7888; + background-color: rgba(73, 94, 109, 0.5); border-radius: 4px; } From 3d5ee563794b6eed241020f72b0e5f0895655886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Wed, 29 May 2024 17:02:02 -0400 Subject: [PATCH 2/4] new pagination style and functionality --- .../js/components/shared/PaginationTable.vue | 89 ++++++++++++++----- resources/sass/_scrollbar.scss | 1 - 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/resources/js/components/shared/PaginationTable.vue b/resources/js/components/shared/PaginationTable.vue index 0323ebb1cf..3c2dd9a5cc 100644 --- a/resources/js/components/shared/PaginationTable.vue +++ b/resources/js/components/shared/PaginationTable.vue @@ -1,29 +1,51 @@