From aa6c10ddabe3dd0664369ef4659465f3deec8ce0 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Mon, 6 Nov 2023 19:51:00 +0530 Subject: [PATCH] admin window cleanup --- forms-flow-admin/src/components/footer/footer.tsx | 2 +- forms-flow-admin/src/components/roles/roles.tsx | 3 ++- forms-flow-admin/src/index.tsx | 6 +++--- forms-flow-theme/src/baseStyle.scss | 7 ++++--- forms-flow-theme/src/global.scss | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/forms-flow-admin/src/components/footer/footer.tsx b/forms-flow-admin/src/components/footer/footer.tsx index 764e87ca1..d7ab968a9 100644 --- a/forms-flow-admin/src/components/footer/footer.tsx +++ b/forms-flow-admin/src/components/footer/footer.tsx @@ -6,7 +6,7 @@ import { Translation } from "react-i18next"; const version_org = packageInfo.version; const Footer = React.memo(() => { return ( -
+
diff --git a/forms-flow-admin/src/components/roles/roles.tsx b/forms-flow-admin/src/components/roles/roles.tsx index f41095e22..95014cf33 100644 --- a/forms-flow-admin/src/components/roles/roles.tsx +++ b/forms-flow-admin/src/components/roles/roles.tsx @@ -418,6 +418,7 @@ const Roles = React.memo((props: any) => { const pagination = paginationFactory({ showTotal: true, align: "center", + className:"d-flex", sizePerPageList: getpageList(), page: activePage, sizePerPage: sizePerPage, @@ -508,7 +509,7 @@ const Roles = React.memo((props: any) => { <>
-
+
{ return ( <> {isAdmin && ( -
-
-
+
+
+
diff --git a/forms-flow-theme/src/baseStyle.scss b/forms-flow-theme/src/baseStyle.scss index 7676d2c0b..da9b18491 100644 --- a/forms-flow-theme/src/baseStyle.scss +++ b/forms-flow-theme/src/baseStyle.scss @@ -4,14 +4,15 @@ body { font-size: 16px; font-family: Nunito Sans, SemiBold; overflow: hidden; + background-color: var(--color-main-bg); } .main-container{ - max-height: calc(100vh - 59px); + max-height: calc(100vh - 52px); overflow-y: auto; - background-color: var(--color-main-bg); + } .min-container-height{ - min-height: calc(100vh - 164px); + min-height: calc(100vh - 170px); } \ No newline at end of file diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss index cdb93a841..d9dd5a218 100644 --- a/forms-flow-theme/src/global.scss +++ b/forms-flow-theme/src/global.scss @@ -31,7 +31,7 @@ --color-gray-700: #495057; --color-gray-800: #373a3c; --color-gray-900: #212529; - + --color-main-bg: #F7F7F7; --head-inactive: #909090; --logo-path: "./logo.svg";