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

css fixes #1792

Merged
merged 2 commits into from
Nov 11, 2024
Merged

css fixes #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf9af86
css fixes
Bhavya-egov Nov 11, 2024
56f9f8b
Merge branch 'console' into fux
jagankumar-egov Nov 11, 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
4 changes: 2 additions & 2 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
font-weight: 700;
}
.description-type {
margin-top: 2rem;
margin-bottom: 2rem;
margin-top: 0rem;
margin-bottom: 0rem;
}
.name-description {
margin: 0rem;
Expand Down
5 changes: 5 additions & 0 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/coreOverride.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
}
header {
@extend .typography.text-heading-xl;
margin-bottom: 0rem;
}
.digit-button-primary {
background-color: theme(digitv2.lightTheme.primary) !important;
Expand Down Expand Up @@ -201,3 +202,7 @@ header {
.action-bar-wrap .actionBarClass {
z-index: 10;
}
.campaign-flow-stepper{
margin-left: -5.625rem;
margin-right: -6.875rem;
}
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 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 @@ -671,6 +671,7 @@ tbody {
@extend .typography.text-heading-m;
margin: unset;
margin-bottom: 1rem;
margin-top: 0rem !important;
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
}

.label-field-grid {
Expand Down
10 changes: 5 additions & 5 deletions ...i/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState, useMemo, useRef, useEffect, Fragment } from "react";
import { UploadIcon, FileIcon, DeleteIconv2, Toast, Card, Header } from "@egovernments/digit-ui-react-components";
import { UploadIcon, FileIcon, DeleteIconv2, Toast, Header } from "@egovernments/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import { LabelFieldPair } from "@egovernments/digit-ui-react-components";
import { Button, CardText, Dropdown, ErrorMessage, PopUp, Stepper, TextBlock } from "@egovernments/digit-ui-components";
import { Button, CardText, Dropdown, ErrorMessage, PopUp, Stepper, TextBlock , Card} from "@egovernments/digit-ui-components";

const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
const { t } = useTranslation();
Expand Down Expand Up @@ -108,9 +108,9 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {

<div className="card-container2">
<Card className = "setup-campaign-card">
<Header>{t(`HCM_CAMPAIGN_TYPE_HEADER`)}</Header>
<Header styles={{ margin: '0px' }}>{t(`HCM_CAMPAIGN_TYPE_HEADER`)}</Header>
<p className="description-type">{t(`HCM_CAMPAIGN_TYPE_DESCRIPTION`)}</p>
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
<LabelFieldPair>
<LabelFieldPair style={{ alignItems: "center" , display: "flex" }}>
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
<div className="campaign-type">
<span>{`${t("HCM_CAMPAIGN_TYPE")}`}</span>
<span className="mandatory-span">*</span>
Expand Down Expand Up @@ -148,7 +148,7 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
</div>
</LabelFieldPair>
{showBeneficiary && (
<LabelFieldPair>
<LabelFieldPair style={{ alignItems: "center" , display: "flex" }} >
<div className="beneficiary-type">{`${t("HCM_BENEFICIARY_TYPE")}`}</div>
<div>{t(`CAMPAIGN_TYPE_${beneficiaryType}`)}</div>
</LabelFieldPair>
Expand Down
8 changes: 4 additions & 4 deletions ...b/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ const DateWithBoundary = ({ onSelect, formData, ...props }) => {
return (
<>
<Card className={"campaign-update-container"}>
<Header className="header">{t(`HCM_CAMPAIGN_DATES_CHANGE_BOUNDARY_HEADER`)}</Header>
<Card className={"search-field-container"}>
<p className="field-description">{t(`HCM_CAMPAIGN_DATES_CHANGE_BOUNDARY_SUB_TEXT`)}</p>
<Header className="header" styles={{ marginBottom: "0rem" }}>{t(`HCM_CAMPAIGN_DATES_CHANGE_BOUNDARY_HEADER`)}</Header>
<div className={"search-field-container"}>
<p className="field-description" style={{ marginTop: "0rem" }}>{t(`HCM_CAMPAIGN_DATES_CHANGE_BOUNDARY_SUB_TEXT`)}</p>
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
<div className="label-field-grid">
<LabelFieldPair className="update-date-labelField">
<div className="update-label">
Expand Down Expand Up @@ -291,7 +291,7 @@ const DateWithBoundary = ({ onSelect, formData, ...props }) => {
</LabelFieldPair>
<Button variation="primary" label={t(`CAMPAIGN_SELECT_BOUNDARY_BUTTON`)} onClick={() => selectBoundary()} />
</div>
</Card>
</div>
</Card>
{dateReducer?.length > 0 &&
dateReducer?.map((item, index) => (
Expand Down
1 change: 1 addition & 0 deletions .../micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,7 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
currentStep={currentStep + 1}
onStepClick={onStepClick}
activeSteps={active}
className={"campaign-flow-stepper"}
/>
)}
<FormComposerV2
Expand Down