fix tab-list border in dark-mode

resources/scripts/admin/views/estimates/Index.vue

@@ -130,6 +130,7 @@
           mt-5
           list-none
           border-b-2 border-gray-200 border-solid
+          dark:border-gray-600
         "
       >
         <!-- Tabs -->

resources/scripts/admin/views/invoices/Index.vue

@@ -127,6 +127,7 @@
           mt-5
           list-none
           border-b-2 border-gray-200 border-solid
+          dark:border-gray-600
         "
       >
         <!-- Tabs -->

resources/scripts/admin/views/recurring-invoices/Index.vue

@@ -121,6 +121,7 @@
           mt-5
           list-none
           border-b-2 border-gray-200 border-solid
+          dark:border-gray-600
         "
       >
         <!-- Tabs -->

resources/scripts/components/base/BaseTabGroup.vue

@@ -7,7 +7,7 @@
     >
       <TabList
         :class="[
-          'flex border-b border-grey-light',
+          'flex border-b border-grey-light dark:border-gray-600',
           'relative overflow-x-auto overflow-y-hidden',
           'lg:pb-0 lg:ml-0',
         ]"
@@ -22,8 +22,8 @@
             :class="[
               'px-8 py-2 text-sm leading-5 font-medium flex items-center relative border-b-2 mt-4 focus:outline-none whitespace-nowrap',
               selected
-                ? ' border-primary-400 text-black font-medium'
+                ? 'border-primary-400 text-black font-medium dark:text-white'
-                : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300',
+                : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:border-gray-500',
             ]"
           >
             {{ tab.title }}

resources/scripts/components/base/base-table/BaseTable.vue

@@ -7,18 +7,11 @@
             relative
             overflow-hidden
             bg-white
-            border-b
+            border-b border-gray-200
-            border-gray-200
             shadow
             sm:rounded-lg
-            dark:shadow-glass
-            dark:border
-            dark:border-white/10
-            dark:bg-gray-800/70
           "
         >
-          <BaseDarkHighlight v-if="darkHighlight" class="z-[-1]" />
-
           <slot name="header" />
           <table :class="tableClass">
             <thead :class="theadClass">
@@ -58,11 +51,7 @@
               <tr
                 v-for="placeRow in placeholderCount"
                 :key="placeRow"
-                :class="
+                :class="placeRow % 2 === 0 ? 'bg-white' : 'bg-gray-50'"
-                  placeRow % 2 === 0
-                    ? 'bg-white dark:bg-gray-800'
-                    : 'bg-gray-50 dark:bg-gray-800'
-                "
               >
                 <td
                   v-for="column in columns"
@@ -86,11 +75,7 @@
               <tr
                 v-for="(row, index) in sortedRows"
                 :key="index"
-                :class="
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-gray-50'"
-                  index % 2 === 0
-                    ? 'bg-white dark:bg-transparent'
-                    : 'bg-gray-50 dark:bg-gray-700/20 dark:border-y dark:border-gray-600'
-                "
               >
                 <td
                   v-for="column in columns"
@@ -118,10 +103,7 @@
               justify-center
               w-full
               h-full
-              bg-white
+              bg-white bg-opacity-60
-              bg-opacity-60
-              dark:bg-gray-700
-              dark:bg-opacity-60
             "
           >
             <SpinnerIcon class="w-10 h-10 text-primary-500" />
@@ -181,12 +163,9 @@ const props = defineProps({
   sortOrder: { type: String, default: '' },
   tableClass: {
     type: String,
-    default: 'min-w-full divide-y divide-gray-200 dark:divide-gray-600',
+    default: 'min-w-full divide-y divide-gray-200',
-  },
-  theadClass: {
-    type: String,
-    default: 'bg-gray-50 dark:bg-gray-800 dark:text-white',
   },
+  theadClass: { type: String, default: 'bg-gray-50' },
   tbodyClass: { type: String, default: '' },
   noResultsMessage: {
     type: String,
@@ -207,10 +186,6 @@ const props = defineProps({
     type: Number,
     default: 3,
   },
-  darkHighlight: {
-    type: Boolean,
-    default: false,
-  },
 })
 
 let rows = reactive([])
@@ -261,7 +236,7 @@ function getColumn(columnName) {
 
 function getThClass(column) {
   let classes =
-    'whitespace-nowrap px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-white'
+    'whitespace-nowrap px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider'
 
   if (column.defaultThClass) {
     classes = column.defaultThClass
@@ -281,8 +256,7 @@ function getThClass(column) {
 }
 
 function getTdClass(column) {
-  let classes =
+  let classes = 'px-6 py-4 text-sm text-gray-500 whitespace-nowrap'
-    'px-6 py-4 text-sm text-gray-500 whitespace-nowrap dark:text-gray-300'
 
   if (column.defaultTdClass) {
     classes = column.defaultTdClass
@@ -335,7 +309,6 @@ function changeSorting(column) {
   }
 
   if (!usesLocalData.value) {
-    if (pagination.value) pagination.value.currentPage = 1
     mapDataToRows()
   }
 }
@@ -353,9 +326,7 @@ async function pageChange(page) {
   await mapDataToRows()
 }
 
-async function refresh(isPreservePage = false) {
+async function refresh() {
-  if (pagination.value && !isPreservePage) pagination.value.currentPage = 1
-
   await mapDataToRows()
 }