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

#1769) Fixed loader,breadcrumb,table cells css and added placeholder text for assumption fields
egovernments · Nov 7, 2024 · 0b6af4c · 0b6af4c
1 parent 74949f3
commit 0b6af4c
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 9 deletions.
diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -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].25/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].26/dist/index.css" />
 
   <!-- added below css for hcm-workbench module inclusion-->
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -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 <[email protected]>",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss
@@ -329,4 +329,10 @@
   &:last-of-type{
     border-left: none !important;
   }
+}
+
+.table tbody td{
+  p{
+    margin: 0rem;
+  }
 }
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -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 {

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json
@@ -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",

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtTable.js b/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtTable.js
@@ -42,7 +42,7 @@ const DataMgmtTable = ({ file, index, handleFileDelete, handleRedirect, setShowP
                     getCellProps={(cellInfo) => {
                         return {
                             style: {
-                                padding: "20px 18px",
+                                padding: "16px",
                                 fontSize: "16px",
                                 whiteSpace: "normal",
                             },

diff --git a/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js b/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js
@@ -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);

diff --git a/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js b/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js
@@ -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

diff --git a/...-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/BreadCrumbNew.js b/...-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/BreadCrumbNew.js
@@ -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 (

diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json
@@ -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",

diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
@@ -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].25/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].26/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT HCM</title>

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/components/table.scss b/micro-ui/web/micro-ui-internals/packages/css/src/components/table.scss
@@ -3,7 +3,7 @@
 
   thead {
     th {
-      padding: 20px 18px;
+      padding: 16px;
       @apply font-bold align-middle text-left;
       &:first-child {
         min-width: 256px;