diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json index 2632d93bf49..5f44a0abe9d 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-css", - "version": "1.8.2-beta.37", + "version": "1.8.2-beta.38", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/InboxLinks.scss b/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/InboxLinks.scss index 7549fe0b3d9..681fca26f14 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/InboxLinks.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/InboxLinks.scss @@ -16,7 +16,7 @@ align-items: center; justify-content: flex-start; .inbox-search-icon--projects { - fill : #f47738; + fill : theme(colors.primary.main); height: 2rem; width: 2rem; } @@ -52,7 +52,7 @@ @extend .light-primary; padding: 8px; --text-opacity: 1; - color: #f47738; + color: theme(colors.primary.main); color: rgba(244, 119, 56, var(--text-opacity)); } } diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/inboxSearchComposer.scss b/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/inboxSearchComposer.scss index 7fb3189a27b..4269a3e4a7e 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/inboxSearchComposer.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/components/inboxv2/inboxSearchComposer.scss @@ -32,10 +32,10 @@ @extend .light-text-color-primary; } .inbox-links-icon{ - color:#f47738; - fill:#f47738; + color:theme(colors.primary.main); + fill:theme(colors.primary.main); path{ - fill:#f47738; + fill:theme(colors.primary.main); } } } @@ -88,7 +88,7 @@ } &.links { height: 100%; - color : #f47738; + color : theme(colors.primary.main); .inbox-search-links-component { height: 100% !important; width: 100%; diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/components/navbar.scss b/micro-ui/web/micro-ui-internals/packages/css/src/components/navbar.scss index 1074ce0a3ef..1b0ae7cb72c 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/components/navbar.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/components/navbar.scss @@ -50,6 +50,9 @@ } &.name-Profile { .label-text { + padding: 0 1rem; + word-break: break-word; + margin-bottom: 0.5rem; letter-spacing: 0.6px; font-weight: 700; font-size: 18px; diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss b/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss index af97f529369..8af10232ef1 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/digitv2/pages/employee/workbench.scss @@ -598,12 +598,12 @@ .browse-text { text-decoration: none; - color: #F47738; + color: theme(colors.primary.main); transition: color 0.3s; } .browse-text:hover { - color: #F47738; + color: theme(colors.primary.main); text-decoration: underline; cursor: pointer; } @@ -779,7 +779,7 @@ button:hover { width: 100%; height: 2.5rem; --border-opacity: 1; - border: 1px solid #f47738; + border: 1px solid theme(colors.primary.main); border-color: rgba(244, 119, 56, var(--border-opacity)); } @@ -802,7 +802,7 @@ button:hover { .add-new { position: relative; - color: #F47738; + color: theme(colors.primary.main); cursor: pointer; margin-right: 1em; font-weight: bolder; @@ -849,7 +849,7 @@ button:hover { .view-all-link { background-color: #bdc5d1; - color: #f47738; + color: theme(colors.primary.main); font-size: 16px; text-decoration: underline; cursor: pointer; diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/index.scss index 7b3c81ce0f7..d8da710e734 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/index.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/index.scss @@ -130,7 +130,7 @@ h4{ margin:0px !important; } - color:#f47738; + color:theme(colors.primary.main); display: flex !important; align-items: center; svg { diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/inbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/inbox.scss index 1d193dca78d..d0b33db7645 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/inbox.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/inbox.scss @@ -546,7 +546,7 @@ padding: 10px 35px; color: rgb(244, 119, 56); background-color: #fff; - border: 1px solid #f47738; + border: 1px solid theme(colors.primary.main); border-radius: 0.5rem 0.5rem 0 0; border-bottom: 4px solid rgb(244, 119, 56); font-weight: 700; diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss index c76a71348b2..00dd68bb457 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss @@ -383,6 +383,21 @@ } } } + .digit-dropdown-employee-select-wrap.language-dropdown{ + .header-dropdown-label{ + .cp{ + color: #fff + } + .header-dropdown-arrow{ + path{ + fill: #fff; + } + } + } + .header-dropdown-menu{ + right: 1rem; + } + } .select-wrap { margin-bottom: unset; svg { diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss index 69e26e65f80..52a419fe672 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss @@ -43,7 +43,7 @@ } tbody { tr:hover { - background: rgba(#f47738, 0.12); + background: rgba(theme(colors.primary.main), 0.12); } } } @@ -143,7 +143,7 @@ align-self: flex-end; margin-top: 3rem; width: 100%; - background-color: #c84c0e; + background-color: theme(colors.primary.main); } .bannerHeader { @@ -302,7 +302,7 @@ } .submit-bar { - background-color: #c84c0e; + background-color: theme(colors.primary.main); } .digit-employee-card.card-sandbox { @@ -534,7 +534,7 @@ digit-card-text.center { } } .quickLink { - color: #c84c0e; + color: theme(colors.primary.main); text-decoration: none; font-weight: 700; font-size: 1.5rem; diff --git a/micro-ui/web/micro-ui-internals/packages/css/svg/check.svg b/micro-ui/web/micro-ui-internals/packages/css/svg/check.svg index 88018af3276..c3643141d9f 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/svg/check.svg +++ b/micro-ui/web/micro-ui-internals/packages/css/svg/check.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/micro-ui/web/micro-ui-internals/packages/css/svg/starempty.svg b/micro-ui/web/micro-ui-internals/packages/css/svg/starempty.svg index 8d295e7219b..2016823606f 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/svg/starempty.svg +++ b/micro-ui/web/micro-ui-internals/packages/css/svg/starempty.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/micro-ui/web/micro-ui-internals/packages/css/svg/starfilled.svg b/micro-ui/web/micro-ui-internals/packages/css/svg/starfilled.svg index 23481e8ccb2..e89b448a158 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/svg/starfilled.svg +++ b/micro-ui/web/micro-ui-internals/packages/css/svg/starfilled.svg @@ -1,4 +1,4 @@ - + diff --git a/micro-ui/web/micro-ui-internals/packages/css/tailwind.config.js b/micro-ui/web/micro-ui-internals/packages/css/tailwind.config.js index 1e256ad26df..8d23d23c00e 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/tailwind.config.js +++ b/micro-ui/web/micro-ui-internals/packages/css/tailwind.config.js @@ -93,7 +93,7 @@ module.exports = { }, boxShadow: { card: "0 1px 2px 0 rgba(0, 0, 0, 0.16)", - radiobtn: "0 0 0 5px #F47738", + radiobtn: "0 0 0 5px #c84c0e", }, inset: { 0: 0, diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/pdf.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/pdf.js index 5b7442d1482..27bc1d8069f 100644 --- a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/pdf.js +++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/pdf.js @@ -249,7 +249,7 @@ const createBodyContentBillAmend = (table,t) => { let bodyData = [] bodyData.push({ text: t(table?.title), - color: "#F47738", + color: "#c84c0e", style: "header", fontSize: 14, bold: true, @@ -259,9 +259,9 @@ const createBodyContentBillAmend = (table,t) => { layout:{ fillColor:function(rowIndex,node,columnIndex){ if(rowIndex === (table?.tableRows?.length)) { - return "#F47738" + return "#c84c0e" } - return (rowIndex % 2 === 0) ? "#F47738" : null; + return (rowIndex % 2 === 0) ? "#c84c0e" : null; }, fillOpacity:function(rowIndex,node,columnIndex) { if (rowIndex === (table?.tableRows?.length)) { @@ -351,7 +351,7 @@ const createHeaderBillAmend = (headerDetails, logo, tenantId,t) => { fontSize: 16, alignment: "right", margin: [-40, 10, 2, 0], - color: "#F47738" + color: "#c84c0e" } ], [ @@ -371,7 +371,7 @@ const createHeaderBillAmend = (headerDetails, logo, tenantId,t) => { fontSize: 16, margin: [0, -45, 10, 0], alignment: "right", - color: "#F47738" + color: "#c84c0e" } ], [ @@ -518,7 +518,7 @@ const createBodyContent = (details) => { [ { text: table?.title, - color: "#F47738", + color: "#c84c0e", style: "header", fontSize: 14, bold: true @@ -542,7 +542,7 @@ const createBodyContent = (details) => { table?.title?.map(t=>{ return { text:t, - color: "#F47738", + color: "#c84c0e", style: "header", fontSize: 14, bold: true, @@ -588,7 +588,7 @@ function createContentDetails(details) { [ { text: detail?.title, - color: "#F47738", + color: "#c84c0e", style: "header", fontSize: 14, bold: true @@ -669,7 +669,7 @@ function createHeader(headerDetails,logo,tenantId) { fontSize: 16, alignment: "right", margin: [-40, 10, 2, 0], - color: "#F47738" + color: "#c84c0e" } ], [ @@ -689,7 +689,7 @@ function createHeader(headerDetails,logo,tenantId) { fontSize: 16, margin: [0, -50, 10, 0], alignment: "right", - color: "#F47738" + color: "#c84c0e" } ], [ diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js index 3773e720aaa..89978940005 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js @@ -624,7 +624,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { onClick={updateProfile} style={{ marginTop: "24px", - backgroundColor: "#F47738", + backgroundColor: "#c84c0e", width: "100%", height: "40px", color: "white", @@ -881,7 +881,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { onClick={updateProfile} style={{ marginTop: "24px", - backgroundColor: "#F47738", + backgroundColor: "#c84c0e", width: "100%", height: "40px", color: "white", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomHorizontalBarChart.js b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomHorizontalBarChart.js index f418d6352d6..41fbb277998 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomHorizontalBarChart.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomHorizontalBarChart.js @@ -7,7 +7,7 @@ import FilterContext from "./FilterContext"; import NoData from "./NoData"; const barColors = ["#048BD0", "#FBC02D", "#8E29BF", "#EA8A3B", "#0BABDE" , "#6E8459", "#D4351C","#0CF7E4","#F80BF4","#22F80B"] -const barColorsv2 = ["#048BD0","#5AD8A6","#F47738","#FBC02D","#2DD6FB"] +const barColorsv2 = ["#048BD0","#5AD8A6","#c84c0e","#FBC02D","#2DD6FB"] const renderPlot = (plot,key,denomination) => { const plotValue = key?plot?.[key]:plot?.value || 0; diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js index b9ebb4fdb26..a0f7d5ba415 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js @@ -324,7 +324,7 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination } if (response?.responseData?.drillDownChartId !== "none" && filter !== undefined) { return ( getDrilldownCharts( cellValue?.includes("DSS_TB_")?row?.original?.key:cellValue, diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MapChart.js b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MapChart.js index f3635878a15..d2599cd2cfc 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MapChart.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MapChart.js @@ -14,7 +14,7 @@ import { format } from "date-fns"; const PROJECTION_CONFIG = { scale: 320, center: [85.9629, 22.5937] }; // Red Variants -const COLOR_RANGE = ["#54D140", "#298CFF", "#F47738", "#D1D1D1"]; +const COLOR_RANGE = ["#54D140", "#298CFF", "#c84c0e", "#D1D1D1"]; const STATUS = ["Live", "UnderImplementation", "OnBoarded", "None"]; const DEFAULT_COLOR = "#D1D1D1"; diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/Arrow_Right.svg b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/Arrow_Right.svg index c7017054f32..4f68dc487a4 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/Arrow_Right.svg +++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/Arrow_Right.svg @@ -1,3 +1,3 @@ - + diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/dashboards.svg b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/dashboards.svg index 9cf3c33b1dd..d4b50b8c762 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/dashboards.svg +++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/images/dashboards.svg @@ -1,6 +1,6 @@ - + diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js index 077c60d55db..4ab4a40a3fd 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js @@ -463,7 +463,7 @@ const Home = ({ stateCode }) => { style={{ float: "right", textAlign: "right", - color: "#F47738", + color: "#c84c0e", fontSize: 16, fontWeight: "bold", display: "flex", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/Response.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/Response.js index d0ad6fa0a98..0dcbdf84ea0 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/Response.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/Response.js @@ -147,7 +147,7 @@ const Response = () => { const children = (
navigate("home")}> - + {t("CORE_COMMON_GO_TO_HOME")}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/SandboxResponse.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/SandboxResponse.js index eeb792feb0f..6d8c75204c4 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/SandboxResponse.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/SandboxResponse.js @@ -30,7 +30,7 @@ const Response = () => { const children = (
navigate("home")}> - + {t("CORE_COMMON_GO_TO_HOME")}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/utilities/src/pages/employee/DocViewer.js b/micro-ui/web/micro-ui-internals/packages/modules/utilities/src/pages/employee/DocViewer.js index 77cd09922e6..13af40a3b26 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/utilities/src/pages/employee/DocViewer.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/utilities/src/pages/employee/DocViewer.js @@ -55,7 +55,7 @@ const DocViewerWrapper = (props) => { { const { t } = useTranslation(); @@ -69,7 +70,7 @@ const LevelCards = ({ onSelect, formData, props }) => { label={`${t("DELETE_LEVEL")}`} type="button" className="CloseLevelButton" - icon={} + icon={} onButtonClick={() => handleDeleteRowDetails(index)} style={{ fontSize: "1rem" }} /> @@ -84,7 +85,7 @@ const LevelCards = ({ onSelect, formData, props }) => { label={`${t("WBH_ADD_LEVEL")}`} type="button" className="workbench-add-row-detail-btn" - icon={} + icon={} onButtonClick={handleCreateNewLevelDetails} style={{ fontSize: "1rem" }} /> diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelect.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelect.js index 50fcb002490..7a28413cab3 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelect.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelect.js @@ -4,19 +4,20 @@ import { useTranslation } from "react-i18next"; import { useHistory } from "react-router-dom"; import { Loader, InfoBannerIcon, Button, Close } from "@egovernments/digit-ui-react-components"; import MDMSSearchv2Popup from "../pages/employee/MDMSSearchv2Popup"; +import { COLOR_FILL } from "../utils/contants"; const customStyles = { control: (provided, state) => ({ ...provided, - borderColor: state.isFocused ? "#f47738" : "#505a5f", + borderColor: state.isFocused ? "#c84c0e" : "#505a5f", borderRadius: "unset", "&:hover": { - borderColor: "#f47738", + borderColor: "#c84c0e", }, }), option: (provided, state) => ({ ...provided, - backgroundColor: state.isSelected ? "#f47738" : "white", // Background color for selected options + backgroundColor: state.isSelected ? "#c84c0e" : "white", // Background color for selected options color: state.isSelected ? "white" : "black", // Text color for selected options "&:hover": { backgroundColor: "#ffe6cc", // Very light orange background color on hover @@ -163,7 +164,7 @@ const CustomSelectWidget = (props) => { style={{ cursor: "pointer" }} onClick={handleInfoBannerClick} // Add the click event handler > - +
*/} @@ -198,7 +199,7 @@ const CustomSelectWidget = (props) => { > {(selectedDetails && selectedDetails.length > 0 && data) && ( - + )} diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelectV2.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelectV2.js index bd8e7accebd..f6bcaa2a0ab 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelectV2.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/components/MultiSelectV2.js @@ -7,10 +7,10 @@ import _ from "lodash"; const customStyles = { control: (provided, state) => ({ ...provided, - borderColor: state.isFocused ? "#f47738" : "#505a5f", + borderColor: state.isFocused ? "#c84c0e" : "#505a5f", borderRadius: "unset", "&:hover": { - borderColor: "#f47738", + borderColor: "#c84c0e", }, }), }; diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/BoundaryUploadPure.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/BoundaryUploadPure.js index 20f14ce1ac8..f3d5ab2e7d2 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/BoundaryUploadPure.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/BoundaryUploadPure.js @@ -7,6 +7,7 @@ import { Button } from "@egovernments/digit-ui-react-components"; import GenerateXlsx from "../../components/GenerateXlsx"; import { useHistory } from "react-router-dom"; import { Toast } from "@egovernments/digit-ui-components"; +import { COLOR_FILL } from "../../utils/contants"; const UploadBoundaryPure = () => { const { t } = useTranslation(); @@ -350,7 +351,7 @@ const UploadBoundaryPure = () => {