admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Adding Page-min-h and css to decrease the size of scrollbar.

Browse Source
This commit is contained in:
Kartik Sharma 2025-12-09 11:55:41 +05:30
parent a0257c1252
commit e5d4f65e49
3 changed files with 503 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

557
public/assets/css/core-extend.css
View File

File diff suppressed because it is too large Load Diff

18
src/components/Layout/Header.jsx
View File

@ -26,10 +26,10 @@ const Header = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading } = useMaster(); const { data, loading } = useMaster();
const navigate = useNavigate(); const navigate = useNavigate();
const {onOpen} = useAuthModal() const { onOpen } = useAuthModal()
const { onOpen:changePass } = useModal("ChangePassword"); const { onOpen: changePass } = useModal("ChangePassword");
const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT); const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT);
const { mutate : logout,isPending:logouting} = useLogout() const { mutate: logout, isPending: logouting } = useLogout()
const isDashboardPath = const isDashboardPath =
/^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname); /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname);
@ -54,7 +54,7 @@ const Header = () => {
/^\/advance-payment(\/[0-9a-fA-F-]{36})?$/.test(pathname); /^\/advance-payment(\/[0-9a-fA-F-]{36})?$/.test(pathname);
return !(isDirectoryPath || isProfilePage || isExpensePage || isPaymentRequest || isRecurringExpense || isAdvancePayment ||isServiceProjectPage || isAdvancePayment1); return !(isDirectoryPath || isProfilePage || isExpensePage || isPaymentRequest || isRecurringExpense || isAdvancePayment || isServiceProjectPage || isAdvancePayment1);
}; };
const allowedProjectStatusIds = [ const allowedProjectStatusIds = [
"603e994b-a27f-4e5d-a251-f3d69b0498ba", "603e994b-a27f-4e5d-a251-f3d69b0498ba",
@ -218,10 +218,10 @@ const Header = () => {
projectsForDropdown && projectsForDropdown &&
projectsForDropdown.length > 0 && ( projectsForDropdown.length > 0 && (
<ul <ul
className="dropdown-menu" className="dropdown-menu custom-scrollbar"
style={{ overflow: "auto", maxHeight: "300px" }} style={{ overflow: "auto", maxHeight: "300px" }}
> >
{(isDashboardPath|| isCollectionPath) &&( {(isDashboardPath || isCollectionPath) && (
<li> <li>
<button <button
className="dropdown-item" className="dropdown-item"
@ -402,7 +402,7 @@ const Header = () => {
<li> <li>
<div className="dropdown-divider"></div> <div className="dropdown-divider"></div>
</li> </li>
<li onClick={()=>onOpen()}> <li onClick={() => onOpen()}>
{" "} {" "}
<a <a
className="dropdown-item cusor-pointer" className="dropdown-item cusor-pointer"
@ -448,9 +448,9 @@ const Header = () => {
<a <a
aria-label="click to log out" aria-label="click to log out"
className="dropdown-item cusor-pointer" className="dropdown-item cusor-pointer"
onClick={()=>logout()} onClick={() => logout()}
> >
{logouting ? "Please Wait":<> <i className="bx bx-log-out me-2"></i> {logouting ? "Please Wait" : <> <i className="bx bx-log-out me-2"></i>
<span className="align-middle">SignOut</span></>} <span className="align-middle">SignOut</span></>}
</a> </a>
</li> </li>

2
src/pages/DailyProgressReport/DailyProgrssReport.jsx
View File

@ -97,7 +97,7 @@ const DailyProgrssReport = () => {
]} ]}
/> />
<div className="card card-fullscreen p-5"> <div className="card page-min-h p-5">
{data?.length > 0 && ( {data?.length > 0 && (
<div className="col-sm-4 col-md-3 col-12 text-start"> <div className="col-sm-4 col-md-3 col-12 text-start">
<AppFormController <AppFormController