From 9c4653e968d494bd24f28f01f026b6205952fc23 Mon Sep 17 00:00:00 2001 From: Sachin Chaurasiya Date: Tue, 16 Nov 2021 21:51:25 +0530 Subject: [PATCH] Style : Fixed pagination button style. (#1211) --- .../ui/src/components/Pagination/Pagination.css | 14 +++++++++++--- .../ui/src/components/Pagination/index.tsx | 2 +- .../src/components/buttons/Button/Button.styles.ts | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/catalog-rest-service/src/main/resources/ui/src/components/Pagination/Pagination.css b/catalog-rest-service/src/main/resources/ui/src/components/Pagination/Pagination.css index d5eaf139fc9..4625439f31a 100644 --- a/catalog-rest-service/src/main/resources/ui/src/components/Pagination/Pagination.css +++ b/catalog-rest-service/src/main/resources/ui/src/components/Pagination/Pagination.css @@ -26,9 +26,17 @@ .tw-link:hover { text-decoration: none !important; } -.pagination > .disabled > .tw-link, -.pagination > .disabled > .tw-link:hover, -.pagination > .disabled > .tw-link:focus { +.pagination > .disabled > .tw-link { cursor: not-allowed; color: #7147e8; } + +.pagination > .disabled > .tw-link:hover, +.pagination > .disabled > .tw-link:focus { + cursor: not-allowed; + color: white; +} +.pagination > li > .tw-link:hover, +.pagination > li > .tw-link:focus { + color: white; +} diff --git a/catalog-rest-service/src/main/resources/ui/src/components/Pagination/index.tsx b/catalog-rest-service/src/main/resources/ui/src/components/Pagination/index.tsx index b42703f3c70..20e91ebe2e8 100644 --- a/catalog-rest-service/src/main/resources/ui/src/components/Pagination/index.tsx +++ b/catalog-rest-service/src/main/resources/ui/src/components/Pagination/index.tsx @@ -32,7 +32,7 @@ const Pagination: React.FC = ({ hideFirstLastPages activePage={currentPage} disabledClass="tw-opacity-60 disabled" - itemClass="tw-border tw-border-primary tw-text-blue-500 tw-rounded tw-px-3 tw-py-1.5 tw-text-sm tw-mx-2" + itemClass="tw-border tw-border-primary tw-text-blue-500 tw-rounded tw-px-3 tw-py-1.5 tw-text-sm tw-mx-2 hover:tw-bg-primary " itemsCountPerPage={sizePerPage} linkClass="tw-text-primary tw-font-medium tw-link" nextPageText={ diff --git a/catalog-rest-service/src/main/resources/ui/src/components/buttons/Button/Button.styles.ts b/catalog-rest-service/src/main/resources/ui/src/components/buttons/Button/Button.styles.ts index 7e5d467371a..481ab3b4d7f 100644 --- a/catalog-rest-service/src/main/resources/ui/src/components/buttons/Button/Button.styles.ts +++ b/catalog-rest-service/src/main/resources/ui/src/components/buttons/Button/Button.styles.ts @@ -49,7 +49,7 @@ export const button = { }, primary: { base: 'tw-text-primary tw-border-primary tw-border dark:tw-text-blue-300 focus:tw-outline-none', - active: `active:tw-bg-transparent hover:tw-bg-primary-hover-lite hover:tw-text-white focus:tw-bg-primary + active: `active:tw-bg-transparent hover:tw-bg-primary hover:tw-text-white focus:tw-bg-primary active:tw-bg-primary active:tw-text-white focus:tw-ring focus:tw-ring-purple-300`, disabled: 'tw-opacity-50 tw-cursor-not-allowed', },