From 2db498ed70bb86fdc284a39bebf6ddb5146b1c1a Mon Sep 17 00:00:00 2001 From: rajatpandey441 Date: Sun, 26 Nov 2023 10:47:02 -0500 Subject: [PATCH 1/2] fix(pagination): updating lastPage variable to currPage+4 when layout is table for firstpage var fix The page number was not showing correctly on firsrt few clicks because lastPage variable was not updating on first few clicks when layout is table due to incorrect addition. Was working correctly when layout is pagination. fix #1150 --- src/components/Pagination/Pagination.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pagination/Pagination.tsx b/src/components/Pagination/Pagination.tsx index 2f3d6c6b2..e64cd37c6 100644 --- a/src/components/Pagination/Pagination.tsx +++ b/src/components/Pagination/Pagination.tsx @@ -65,7 +65,7 @@ const PaginationComponent: FC = ({ }) => { const theme = mergeDeep(getTheme().pagination, customTheme); - const lastPage = Math.min(Math.max(currentPage + 2, 5), totalPages); + const lastPage = Math.min(Math.max(layout === 'pagination' ? currentPage + 2 : currentPage + 4, 5), totalPages); const firstPage = Math.max(1, lastPage - 4); const goToNextPage = (): void => { From 85e5ac21b7c1b4ccb29f29d39a4d6cb1c422486b Mon Sep 17 00:00:00 2001 From: rajatpandey441 Date: Sun, 26 Nov 2023 15:12:08 -0500 Subject: [PATCH 2/2] fix(footer>theme.ts): adding margin to right in footer links The link elements were not responsive because there was no default margin set. me-4 was added to non-react footer but not in react footer. #1085 --- src/components/Footer/theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Footer/theme.ts b/src/components/Footer/theme.ts index e608c3d26..4550e9a31 100644 --- a/src/components/Footer/theme.ts +++ b/src/components/Footer/theme.ts @@ -9,7 +9,7 @@ export const footerTheme: FlowbiteFooterTheme = { groupLink: { base: 'flex flex-wrap text-sm text-gray-500 dark:text-white', link: { - base: 'last:mr-0 md:mr-6', + base: 'last:mr-0 md:mr-6 me-4', href: 'hover:underline', }, col: 'flex-col space-y-4',