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

Jump to bottom

Updated sidebar for microplan #1802

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Updated sidebar for microplan #1802

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d43315
Updated sidebar for microplan
Nov 12, 2024
39d368b
Update index.scss
rachana-egov Nov 12, 2024
66eca6a
Merge branch 'console' into side_bar_microplan
rachana-egov Nov 12, 2024
492ee76
Merge branch 'console' into side_bar_microplan
nipunarora-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
10 changes: 5 additions & 5 deletions health/micro-ui/web/micro-ui-internals/example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"start": "react-scripts start"
},
"devDependencies": {
"@egovernments/digit-ui-libraries": "1.8.2-beta.7",
"@egovernments/digit-ui-libraries": "1.8.2-beta.8",
"@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
"@egovernments/digit-ui-components": "0.0.2-beta.49",
"@egovernments/digit-ui-module-core": "1.8.2-beta.13",
"@egovernments/digit-ui-module-core": "1.8.2-beta.25",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
"@egovernments/digit-ui-react-components": "1.8.2-beta.18",
"@egovernments/digit-ui-module-hcmworkbench":"0.0.49",
"@egovernments/digit-ui-module-hcmworkbench": "0.0.49",
"@egovernments/digit-ui-module-campaign-manager": "0.2.1",
"@egovernments/digit-ui-module-microplan":"0.0.1",
"@egovernments/digit-ui-module-microplan": "0.0.1",
"http-proxy-middleware": "^1.0.5",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand All @@ -37,4 +37,4 @@
"last 1 safari version"
]
}
}
}
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].30/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].31/dist/index.css" />

rachana-egov marked this conversation as resolved.
Show resolved Hide resolved
<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->
Expand Down
4 changes: 2 additions & 2 deletions 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.30",
"version": "0.1.31",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <[email protected]>",
Expand Down Expand Up @@ -66,4 +66,4 @@
"digit-ui",
"css"
]
}
}
11 changes: 10 additions & 1 deletion health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
margin: 0;
}

.digit-sidebar {
top: 4.5rem;
}

.user-profile {
margin-top: 6rem;
margin-left: 3.5rem;
}


.main.digit-home-main {
margin-left: 72px;
Expand Down Expand Up @@ -128,7 +137,7 @@
color: theme(digitv2.lightTheme.primary-2) !important;
margin-bottom: 0rem;

&.subBoundary{
&.subBoundary {
@extend .typography.heading-s;
}
}
Expand Down
8 changes: 5 additions & 3 deletions ...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,11 @@ const SetupMicroplan = ({ hierarchyType, hierarchyData }) => {
label={getNextActionLabel()}
/>
{setupCompleted ? (
<ActionBar style={{ zIndex: "19", flexDirection: "row-reverse" }}>
<SubmitBar label={t("GO_BACK_TO_MY_MICROPLAN")} onSubmit={() => history.goBack()} />
</ActionBar>
<ActionBar style={{ zIndex: "19" }} setactionFieldsToRight
actionFields={[
<Button label={t("GO_BACK_TO_MY_MICROPLAN")} onClick={() => history.goBack()} />
]}
/>
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
) : null}
{showToast && (
<Toast
Expand Down
14 changes: 7 additions & 7 deletions health/micro-ui/web/microplan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
],
"homepage": "/microplan-ui",
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.2-beta.7",
"@egovernments/digit-ui-module-core": "1.8.2-beta.13",
"@egovernments/digit-ui-libraries": "1.8.2-beta.8",
"@egovernments/digit-ui-module-core": "1.8.2-beta.25",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
"@egovernments/digit-ui-react-components": "1.8.2-beta.18",
"@egovernments/digit-ui-module-hcmmicroplanning":"0.0.2",
"@egovernments/digit-ui-module-microplan":"0.0.1",
"@egovernments/digit-ui-module-hcmmicroplanning": "0.0.2",
"@egovernments/digit-ui-module-microplan": "0.0.1",
"@egovernments/digit-ui-components": "0.0.2-beta.39",
"@egovernments/digit-ui-module-campaign-manager": "0.2.1",
"babel-loader": "8.1.0",
Expand Down Expand Up @@ -63,14 +63,14 @@
"build:webpack": "yarn build:libraries &&cd .. && ls && cd ./web && ls && yarn build:prod",
"clean": "rm -rf node_modules"
},
"resolutions": {
"resolutions": {
"**/babel-loader": "8.2.2",
"**/@babel/core": "7.14.0",
"**/@babel/preset-env": "7.14.0",
"**/styled-components": "5.0.0",
"**/@babel/plugin-transform-modules-commonjs": "7.14.0",
"**/polished":"4.2.2",
"fast-uri":"2.1.0"
"**/polished": "4.2.2",
"fast-uri": "2.1.0"
},
"eslintConfig": {
"extends": [
Expand Down
6 changes: 3 additions & 3 deletions health/micro-ui/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
],
"homepage": "/digit-ui",
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.2-beta.7",
"@egovernments/digit-ui-libraries": "1.8.2-beta.8",
"@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
"@egovernments/digit-ui-module-core": "1.8.2-beta.13",
"@egovernments/digit-ui-module-core": "1.8.2-beta.25",
"@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
"@egovernments/digit-ui-react-components": "1.8.2-beta.18",
"@egovernments/digit-ui-components": "0.0.2-beta.49",
Expand Down Expand Up @@ -82,4 +82,4 @@
"last 1 safari version"
]
}
}
}
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].30/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].31/dist/index.css" />
rachana-egov marked this conversation as resolved.
Show resolved Hide resolved
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT HCM</title>
Expand Down