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

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 +77 -75
2 changed files with 77 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d4037ed71 - Show all commits

2
src/components/master/CreateRole.jsx
View File

@ -141,7 +141,7 @@ const CreateRole = ({ modalType, onClose }) => {
)} )}
</div> </div>
<div className="col-12 border px-3" <div className="border rounded px-3"
style={{ style={{
maxHeight: "350px", // Adjust this as needed maxHeight: "350px", // Adjust this as needed
overflowY: "auto", overflowY: "auto",

10
src/components/master/EditRole.jsx
View File

@ -200,12 +200,13 @@ const EditMaster = ({ master, onClose }) => {
</div> </div>
<div className="col-12 text-start"> <div className="col-12 text-start">
{/* Scrollable Container */} {/* Scrollable Container with Border */}
<div <div
className="border rounded p-3" // ✅ border applied here
style={{ style={{
maxHeight: "350px", // adjust as needed maxHeight: "350px",
overflowY: "auto", overflowY: "auto",
paddingRight: "10px", // for better scrollbar spacing paddingRight: "10px", // spacing for scrollbar
}} }}
> >
{masterFeatures.map((feature, featureIndex) => ( {masterFeatures.map((feature, featureIndex) => (
@ -281,7 +282,8 @@ const EditMaster = ({ master, onClose }) => {
{errors.permissions && ( {errors.permissions && (
<p className="text-danger">{errors.permissions.message}</p> <p className="text-danger">{errors.permissions.message}</p>
)} )}
</div> </div>
<div className="col-12 text-center"> <div className="col-12 text-center">