Skip to content

Commit

Permalink
admin window cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
shuhaib-aot committed Nov 6, 2023
1 parent 79d868e commit aa6c10d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion forms-flow-admin/src/components/footer/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Translation } from "react-i18next";
const version_org = packageInfo.version;
const Footer = React.memo(() => {
return (
<div>
<div className="pl-md-3 pb-3">
<hr />
<div className="d-flex justify-content-end pb-2">
<div className="font-weight-bold">
Expand Down
3 changes: 2 additions & 1 deletion forms-flow-admin/src/components/roles/roles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -508,7 +509,7 @@ const Roles = React.memo((props: any) => {
<>
<div className="container-admin">
<div className="d-flex align-items-center justify-content-between">
<div className="search-role col-xl-4 col-lg-4 col-md-6 col-sm-5">
<div className="search-role col-xl-4 col-lg-4 col-md-6 col-sm-5 px-0">
<Form.Control
type="text"
placeholder={t("Search by role name")}
Expand Down
6 changes: 3 additions & 3 deletions forms-flow-admin/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ const Admin = React.memo(({ props }: any) => {
return (
<>
{isAdmin && (
<div className="main-container" tabIndex={0}>
<div className="container py-2">
<div className="min-hightcontainer">
<div className="main-container " tabIndex={0}>
<div className="container mt-5">
<div className="min-container-height pl-md-3">
<Head items={headerList()} page={page} />
<ToastContainer theme="colored" />
<Switch>
Expand Down
7 changes: 4 additions & 3 deletions forms-flow-theme/src/baseStyle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion forms-flow-theme/src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down

0 comments on commit aa6c10d

Please sign in to comment.