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

Formula View, and Select Acitivity Screen CSS changes #1803

Merged
merged 11 commits into from
Nov 12, 2024
Merged

Formula View, and Select Acitivity Screen CSS changes #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2872f27
select-activity-commit
abishekTa-egov Nov 12, 2024
0b88abb
Hover over formulaConfigView
abishekTa-egov Nov 12, 2024
99d2978
Merge branch 'console' into abi-12-11
abishekTa-egov Nov 12, 2024
c5119b9
margin adjust
abishekTa-egov Nov 12, 2024
44d729a
removed console
abishekTa-egov Nov 12, 2024
50fbcff
css changes
abishekTa-egov Nov 12, 2024
cfb6ec2
Merge branch 'console' into abi-12-11
abishekTa-egov Nov 12, 2024
419b9ca
package update
abishekTa-egov Nov 12, 2024
a562cc9
changes to css
abishekTa-egov Nov 12, 2024
4428a90
Merge branch 'console' into abi-12-11
abishekTa-egov Nov 12, 2024
c0b6d75
package css update
abishekTa-egov Nov 12, 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/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].31/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].32/dist/index.css" />

<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/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.31",
"version": "0.1.32",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <[email protected]>",
Expand Down
8 changes: 8 additions & 0 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,4 +335,12 @@
p{
margin: 0rem;
}
}

.activity-grid {
display: grid;
grid-template-columns: 33.3% 33.3% 33.3%;
text-align: -webkit-center;
gap: 24px;
margin-right: 3rem;
}
5 changes: 3 additions & 2 deletions ...micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ const ActivityHomeCard = ({onClickCard=()=>{},...props}) => {

return (
<React.Fragment>
<Card className="fsm" style={{ backgroundColor: "transparent", boxShadow: "none", paddingTop: "0" }}>
<Card className="fsm" style={{ backgroundColor: "transparent", boxShadow: "none", paddingTop: "0",marginRight:"1rem",marginLeft:"1rem" }}>
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
<CardHeader> {t(props.title)} </CardHeader>
<div style={{ display: "grid", gridTemplateColumns: "33.3% 33.3% 33.3%", textAlign: "-webkit-center", gap: "24px" }}>
<div className="activity-grid"
>
{props.module.map((i) => {
return (
<CardNew
Expand Down
19 changes: 16 additions & 3 deletions .../micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,32 @@ const FormulaView = ({ output = "N/A", input1 = "N/A", input2 = "N/A", input3 =
type="text"
value={t(input1)}
nonEditable={true}
style={{ width: "100%" }}
style={{
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
width: "100%",
cursor: "pointer",
}}
className="mp-tooltip"
title={t(input1)}
/>
<TextInput
type="text"
value={t(input2)}
nonEditable={true}
style={{ width: "100%" }}
style={{
width: "100%",
cursor: "pointer",
}}
/>
<TextInput
type="text"
value={t(input3)}
nonEditable={true}
style={{ width: "100%" }}
style={{
width: "100%",
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
cursor: "pointer",

}}
title={t(input3)}
/>
</LabelFieldPair>

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/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].31/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].32/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