Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

z-index and camapaign-name in preview #1753

Merged
merged 2 commits into from
Nov 6, 2024
Merged

z-index and camapaign-name in preview #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c298c4d
z-index and camapaign-name in preview
suryansh-egov Nov 6, 2024
42b1c9e
Merge branch 'console' into feature/bug
suryansh-egov Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<title>DIGIT</title>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.49/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.22/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.23/dist/index.css" />

<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-health-css",
"version": "0.1.22",
"version": "0.1.23",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <jagan.kumar@egov.org.in>",
Expand Down
1 change: 1 addition & 0 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/checklist.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@
.mobile-checklist-highlight {
font-weight: theme(digitv2.fontWeight.bold);
padding: 0 0.3125rem;
font-size: larger;
/* 0 to 5px */
}

Expand Down
6 changes: 3 additions & 3 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/coreOverride.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,15 @@ header {
.selecting-boundaries-pop {
min-height: 50%;
}
.employee .digit-employeeSidebar .sidebar {
.employee .digit-employeeSidebar .digit-sidebar {
z-index: 999;
}
.employee .topbar {
.employee .digit-topbar {
z-index: 9999;
}
.digit-popup-overlay .digit-popup-wrapper {
z-index: 10000;
}
.action-bar-wrap .actionBarClass {
z-index: 10;
}
}
4 changes: 2 additions & 2 deletions ...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/MobileChecklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

const MobileChecklist = ({ questions, checklistRole, typeOfChecklist }) => {
const MobileChecklist = ({ questions, campaignName, checklistRole, typeOfChecklist }) => {
// Filter questions with parentId as null
const topLevelQuestions = questions.filter(q => q.parentId === null && q.isActive === true);

Expand All @@ -12,7 +12,7 @@ const MobileChecklist = ({ questions, checklistRole, typeOfChecklist }) => {

<div className="mobile-container">
<div className="mobile-header">
<h2 className='mobile-checklist-highlight'>{typeOfChecklist} {checklistRole}</h2>
<h2 className='mobile-checklist-highlight' style={{fontSize:"1.5rem"}}>{campaignName} {typeOfChecklist} {checklistRole}</h2>
{/* <h1 className="mobile-checklist-highlight">{checklistRole}</h1> */}
{/* <p className="mobile-description"></p> */}
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...icro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ const CreateChecklist = () => {
]}
sortFooterChildren={true}
>
<MobileChecklist questions={previewData} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist>
<MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist>
</PopUp>
)}
<Card type={"primary"} variant={"viewcard"} className={"example-view-card"}>
Expand Down
2 changes: 1 addition & 1 deletion ...icro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ const UpdateChecklist = () => {
sortFooterChildren={true}
>

<MobileChecklist questions={previewData} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist>
<MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist>
</PopUp>
)}
<Card type={"primary"} variant={"viewcard"} className={"example-view-card"}>
Expand Down
2 changes: 1 addition & 1 deletion .../micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/ViewChecklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const ViewChecklist = () => {
{/* <PreviewComponent
questionsArray={previewData}></PreviewComponent> */}

<MobileChecklist questions={previewData} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist>
<MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist>
</PopUp>
)}

Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.49/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.22/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.23/dist/index.css" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT HCM</title>
Expand Down