diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 64a60004fe..831b2f6802 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -17,9 +17,9 @@ "@egovernments/digit-ui-module-dss": "1.5.52", "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", "@egovernments/digit-ui-module-contracts": "0.4.8", - "@egovernments/digit-ui-module-measurement":"0.2.7", - "@egovernments/digit-ui-module-estimate": "0.4.12", - "@egovernments/digit-ui-module-masters": "0.4.11", + "@egovernments/digit-ui-module-measurement":"0.2.8", + "@egovernments/digit-ui-module-estimate": "0.4.13", + "@egovernments/digit-ui-module-masters": "0.4.12", "@egovernments/digit-ui-module-project": "0.4.8", "@egovernments/digit-ui-module-expenditure": "0.4.6", "@egovernments/digit-ui-customisation-mukta": "0.2.6", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json index 63fb4c640d..352469f210 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-works-css", - "version": "0.2.49", + "version": "0.2.50", "license": "MIT", "author": "Jagankumar ", "main": "dist/index.css", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss index 14b031026f..d255e10852 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss @@ -170,4 +170,35 @@ &.label{ margin-top: 0.565rem; } - } \ No newline at end of file + } + + @media (max-width: 30rem){ + .digit-action-bar-wrap{ + height: fit-content; + } + } + + .digit-action-bar-wrap{ + .digit-action-bar-fields{ + .action-bar-individual-action-field{ + button{ + min-width: 14rem; + } + } + } + } + + .viewstatement-viewamount-wrapper, + .totalEstimateAmoutCrad{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + } + + .viewstatement-viewamount-wrapper-create{ + display: flex; + align-items: center; + flex-direction: row-reverse; + justify-content: space-between; + } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json index 9b6e5ab8e2..89510d0ec2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-estimate", - "version": "0.4.12", + "version": "0.4.13", "description": "Estimate Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js index ff8937f966..9828173fc2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js @@ -737,7 +737,7 @@ const CreateEstimate = ({ props }) => { onOptionSelect={(option) => { onActionSelect(option); }} - >, + > ]} setactionFieldsToRight={true} className={"new-actionbar"} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimateConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimateConfig.js index 556dbaa5ad..35d9d1772d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimateConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimateConfig.js @@ -123,13 +123,19 @@ export const createEstimateConfig = () => { { "head": "", "subHead": "", + "sectionClassName":"viewstatement-viewamount-wrapper-create", "navLink": "Work Details", "body": [ { "type": "component", "component": "TotalEstAmount", "withoutLabel": true, - "key": "totalEstimatedAmount" + "key": "totalEstimatedAmount", + "props":{ + style:{ + marginTop:"0px" + } + } }, { "type": "component", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json index 1e8f0d6aed..009bd2ab6c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-masters", - "version": "0.4.11", + "version": "0.4.12", "description": "Masters Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js index b768ff0011..20f30ffb6b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import { useHistory, useLocation } from 'react-router-dom'; import { Header, SubmitBar } from '@egovernments/digit-ui-react-components'; import ApplicationDetails from '../../../../../templates/ApplicationDetails'; -import { Toast,ActionBar } from '@egovernments/digit-ui-components'; +import { Toast,ActionBar,Button } from '@egovernments/digit-ui-components'; const ViewWageSeeker = () => { const { t } = useTranslation() diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json index 6a1886d888..bcf9688de0 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-measurement", - "version": "0.2.7", + "version": "0.2.8", "description": "Measurement Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureCard.js index 9ebff1e74e..284078daaf 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureCard.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/src/components/MeasureCard.js @@ -1,4 +1,5 @@ -import { Button, CardLabelError, CardSectionHeader, CloseSvg } from "@egovernments/digit-ui-react-components"; +import { CardLabelError, CardSectionHeader, CloseSvg } from "@egovernments/digit-ui-react-components"; +import { Button } from "@egovernments/digit-ui-components"; import React, { useReducer, Fragment, useState } from "react"; import { useTranslation } from "react-i18next"; import MeasureRow from "./MeasureRow"; @@ -231,8 +232,9 @@ const MeasureCard = React.memo(({ columns, fields = [], register, setValue, tabl {(mode == "CREATEALL" || mode == "CREATERE") && (