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

Fixed loader,breadcrumb,table cells css and added placeholder text fo… #1769

Merged
merged 1 commit into from
Nov 7, 2024
+22 −9
Merged

Fixed loader,breadcrumb,table cells css and added placeholder text fo… #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.25/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.26/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.25",
"version": "0.1.26",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <jagan.kumar@egov.org.in>",
Expand Down
6 changes: 6 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 @@ -329,4 +329,10 @@
&:last-of-type{
border-left: none !important;
}
}

.table tbody td{
p{
margin: 0rem;
}
}
4 changes: 4 additions & 0 deletions 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 @@ -126,6 +126,10 @@
@extend .typography.heading-m;
color: theme(digitv2.lightTheme.primary-2) !important;
margin-bottom: 0rem;

&.subBoundary{
@extend .typography.heading-s;
}
}

.view-composer-header-section {
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-react-components": "1.8.2-beta.16",
"@egovernments/digit-ui-react-components": "1.8.2-beta.17",
"@egovernments/digit-ui-components": "0.0.2-beta.49",
"react": "17.0.2",
"react-date-range": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const DataMgmtTable = ({ file, index, handleFileDelete, handleRedirect, setShowP
getCellProps={(cellInfo) => {
return {
style: {
padding: "20px 18px",
padding: "16px",
fontSize: "16px",
whiteSpace: "normal",
},
Expand Down
1 change: 1 addition & 0 deletions ...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const Hypothesis = ({ category, assumptions: initialAssumptions,setShowToast,all
style={{ marginBottom: "0", }}
populators={{ name: item }}
id={index}
placeholder={t("MP_ENTER_ASSUMPTION")}
onChange={(event) => {

handleAssumptionChange(category, event, item);
Expand Down
2 changes: 1 addition & 1 deletion ...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const SubBoundaryView = ({ title, arr, style, editHandler, isEditable }) => {
<Card type={"secondary"} style={style}>

<div className="mp-header-container" style={{ marginBottom: "0px" }}>
<Header className="summary-sub-heading">
<Header className="summary-sub-heading subBoundary">
{t(title)}
</Header>
{isEditable && editHandler && <Button
Expand Down
4 changes: 3 additions & 1 deletion ...-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/BreadCrumbNew.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@ const BreadCrumbNew = (props) => {
setExpanded(!expanded);
};

const validCrumbsMain = crumbsToDisplay?.filter((crumb) => crumb?.show === true);

return (
<ol
className={`digit-bread-crumb ${props?.className ? props?.className : ""}`}
style={props?.style}
>
{crumbsToDisplay?.map((crumb, ci) => {
{validCrumbsMain?.map((crumb, ci) => {
if (!crumb?.show) return null;
if (crumb?.isBack)
return (
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/microplan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@egovernments/digit-ui-libraries": "1.8.2-beta.7",
"@egovernments/digit-ui-module-core": "1.8.2-beta.13",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
"@egovernments/digit-ui-react-components": "1.8.2-beta.16",
"@egovernments/digit-ui-react-components": "1.8.2-beta.17",
"@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",
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.25/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.26/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
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/css/src/components/table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

thead {
th {
padding: 20px 18px;
padding: 16px;
@apply font-bold align-middle text-left;
&:first-child {
min-width: 256px;
Expand Down